first commit
improved error messages