fix formatting, work on map generation