WIP
matcher type to replace boolean
more matching cleanup
more refining on match
fix pathinfo