Small changes just to get started: error reporting and formatting