Fix localization and mapping
Utils stuff
Things to undo
Revert "Things to undo"

This reverts commit fb2d370722c8340d871d81349057a8b9b4171482.