incorporated prefixP
small optimiizations to Tools.Matcher
build: added -02
refactoring names in Tools.Matcher