cleaned up the map objects, added more logic to make things work