Updates and error message improvements.

12 files changed