Added validator and bundle to names
File loads now can provide a baseuri/address
Added a scrubber hack to removed bad uris
Fixed space in property name