map fix
smaller bugfixes