some code cleanup
better error format
bump
Merge branch 'better_errors'