Cleaned up most of the error messages, still a lot to do