Bugfixes, allowing map to overwrite keys. Style change as well.