Changes throughout

Edits from Monday morning, taking a break