Lots of error reporting and refactoring and more