synching to latest RDF changes from uva branch