More map stuff

- [ ] make jshint happy