using free draw, the maps state is returned afterwards

@gitnik @aesnyder @cthrax just a heads up on some free-draw fixes. Merging.