added fixes to map movement