several fixes +1 map