Cheddar/edits

See commit messages...