selectors

expand selectors so that they work much better when parsing (more
tolerant, yet more accurate)
better picking of item type in item factory