Added a bit of docs, removed a bit of cruft