incrementally commits and fixes nits