Minor changes, nothing really substantial. I'm not going to add any more
major functionality until I add a bit more documentation for things.
Fixing one thing in last commit