fixes and upd maps