spring cleaning, working on maps