massive changes - fixed map