Added error() as alternative way of matching for errors, similar to complete()
Cleaning up the helper functions a little
Matcher header declaration cleanup