built-in matchers added, basic updated