Some cleanupwq
Merge branch 'better_errors'