Tidied things up considerably. Mostly docstrings remaining.
Moved some stuff.
Another.
PEP8.