Improved error messages and commentary