added fixes to map