nits and cleanup before releasing 0.7