cleaning up and last minute edits