add autotest
move some matchers higher in the spec hierarchy
trim comments
remove some unnecessary code