Cleaned up some error messages and the file in general