Fix error messages, comments