Improved some error messages to make them clearer, and some additional