slight fixes to map, still needs work