Bug fixes

also been working on a new area (still a lot to do), but i dont think its accessible yet