TO_PAT: I hate leftover breakpoints
better error messages.
better error messages on save failure
Merge branch 'master' into patmoore-master