Clean up some bugs

Add header to XML files
Remvoe type from URI objects
Change Contained_In to Contained_Within