pre-release minor fixes and cleanup