Fixed more of the overworld

Fixed the bugs mentioned during the meeting, working on end game now