* Fix a compiler warning
* Flesh out usage() a bit more
* Add debug / info hooks