Work on cleaning up/tweaking the map module