checked in old changes, they are buggy though
fixed bugs in specmatcher code and tests