Some maintenance stuff

First good commit in a good while. Phew.

Just did some basic stuff, fixed some values, fixed a couple of bugs in
some of the scripts.