edits throughout first half of functionality section