fixes

Few fixes to map