work on error messages
cleanup