fine tuning map stuff
fine stuff