better support for less error messages

plus unit tests