mo' clean up and error messages