Things to do

* Fix leaks
* Clean up verbose messages
