comments, cleanup
Fix bad call to saveState() and missing err callback.
Always back off marker.
config naming cleanup.