better "expected" message on non match (Specific Word), also improvements to PHP parsing,
and a few more tests.