Added useful overrides, comments, and error messages