various edits throughout the project