Cleanups etc
Some doc