final edits and cleanup