fixed more error messages
tests pass