tighten up parsing
more strict selector parsing
Merge branch 'property-revamp'