Make comments more consistent
Cleanup
Move various exceptions to one place
Simplify internal adapter plumbing
Add uncommitted file
Bump minor version