Fixed some bugs.. map needs work