* cleanup
* Fix notes and add tools