Did some code cleanup in hopes of finding why map crashes us
Fixed return to map crash (but loose position)