fixed map, anded some styles, finished for this week