fixes to expression matcher, find_, has_ methods, specs