Update user-visible error messages.

500s can be retried, etc.
Small formatting tweaks, remove some obsolete code