Clean up
Add a couple more docs