For #66 I cleaned up a few other minor points, but this is still not nearly as clear as I would like it. Specifically exception are not being captured in a sensical way.