bugfixes for map / isnt over yet