missing edits and cleanup from last commit