minor layout and ontoogy changes