Bulk changes following Jeavon's review 28/04

Full comments in github.