diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/ConceptualQueryProcessor.java b/com.epistimis.uddl/src/com/epistimis/uddl/ConceptualQueryProcessor.java
index 997d0d2..67b10be 100644
--- a/com.epistimis.uddl/src/com/epistimis/uddl/ConceptualQueryProcessor.java
+++ b/com.epistimis.uddl/src/com/epistimis/uddl/ConceptualQueryProcessor.java
@@ -65,7 +65,7 @@ protected List<ConceptualCharacteristic> getCharacteristics(ConceptualEntity obj
 	protected String getCharacteristicRolename(ConceptualCharacteristic obj) { return obj.getRolename(); }
 
 	@Override
-	protected ConceptualComposableElement getCharacteristicType(ConceptualCharacteristic obj) {
+	public ConceptualComposableElement getCharacteristicType(ConceptualCharacteristic obj) {
 		// TODO Auto-generated method stub
 		if (obj instanceof ConceptualComposition) {
 			return ((ConceptualComposition)obj).getType();
diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/LogicalQueryProcessor.java b/com.epistimis.uddl/src/com/epistimis/uddl/LogicalQueryProcessor.java
index 1327f30..261d47c 100644
--- a/com.epistimis.uddl/src/com/epistimis/uddl/LogicalQueryProcessor.java
+++ b/com.epistimis.uddl/src/com/epistimis/uddl/LogicalQueryProcessor.java
@@ -66,7 +66,7 @@ protected List<LogicalCharacteristic> getCharacteristics(LogicalEntity obj) {
 	protected String getCharacteristicRolename(LogicalCharacteristic obj) { return obj.getRolename(); }
 
 	@Override
-	protected LogicalComposableElement getCharacteristicType(LogicalCharacteristic obj) {
+	public LogicalComposableElement getCharacteristicType(LogicalCharacteristic obj) {
 		// TODO Auto-generated method stub
 		if (obj instanceof LogicalComposition) {
 			return ((LogicalComposition)obj).getType();
diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/PlatformQueryProcessor.java b/com.epistimis.uddl/src/com/epistimis/uddl/PlatformQueryProcessor.java
index c6803f9..6d9d5ea 100644
--- a/com.epistimis.uddl/src/com/epistimis/uddl/PlatformQueryProcessor.java
+++ b/com.epistimis.uddl/src/com/epistimis/uddl/PlatformQueryProcessor.java
@@ -49,7 +49,7 @@ protected EClass getRelatedPackageEntityInstance(PlatformQuery obj) {
 	protected String getCharacteristicRolename(PlatformCharacteristic obj) { return obj.getRolename(); }
 
 	@Override
-	protected PlatformComposableElement getCharacteristicType(PlatformCharacteristic obj) {
+	public PlatformComposableElement getCharacteristicType(PlatformCharacteristic obj) {
 		// TODO Auto-generated method stub
 		if (obj instanceof PlatformComposition) {
 			return ((PlatformComposition)obj).getType();
diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/QueryProcessor.java b/com.epistimis.uddl/src/com/epistimis/uddl/QueryProcessor.java
index 63264ed..d3698fb 100644
--- a/com.epistimis.uddl/src/com/epistimis/uddl/QueryProcessor.java
+++ b/com.epistimis.uddl/src/com/epistimis/uddl/QueryProcessor.java
@@ -148,7 +148,7 @@ public abstract class QueryProcessor<ComposableElement extends UddlElement,
 	abstract protected EClass getRelatedPackageEntityInstance(Query obj);
 
 	// Get the Characteristic's type, rolename, or bounds
-	abstract protected ComposableElement getCharacteristicType(Characteristic obj);
+	abstract public ComposableElement getCharacteristicType(Characteristic obj);
 
 	abstract protected String getCharacteristicRolename(Characteristic obj);
 
@@ -343,8 +343,9 @@ public QueryStatement parseQuery(Query query) {
 	 * Processing a CompositeQuery just means drilling down and processing each
 	 * contained individual query
 	 * 
-	 * @param query
-	 * @return
+	 * @param query A CompositeQuery to process
+	 * @return a map of (Query, QueryStatement) pairs. The QueryStatement is the result of parsing the specification in that
+	 * Query. This stores only individual queries- flattening the CompositeQuery
 	 */
 	@SuppressWarnings("unchecked")
 	public Map<Query, QueryStatement> parseCompositeQuery(CompositeQuery query) {
@@ -366,8 +367,8 @@ public Map<Query, QueryStatement> parseCompositeQuery(CompositeQuery query) {
 	/**
 	 * Get all the Entities referenced by this Query.
 	 * 
-	 * @param conn
-	 * @return
+	 * @param query A query to analyze.
+	 * @return a map of Entities referenced by this Query, keyed by the alias for the Entity used in the query
 	 */
 	public Map<String, Entity> getReferencedEntities(Query query) {
 		Map<String, Entity> entities = new HashMap<String, Entity>();
@@ -380,8 +381,8 @@ public Map<String, Entity> getReferencedEntities(Query query) {
 	/**
 	 * Get all the Entities referenced by this CompositeQuery.
 	 * 
-	 * @param conn
-	 * @return
+	 * @param query A CompositeQuery to process
+	 * @return a map of Entities referenced by this Query, keyed by the alias for the Entity used in the query
 	 */
 	public Map<String, Entity> getReferencedEntitiesComposite(CompositeQuery query) {
 		Map<String, Entity> entities = new HashMap<String, Entity>();
diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/UddlQNP.java b/com.epistimis.uddl/src/com/epistimis/uddl/UddlQNP.java
index c005e75..24e3bb9 100644
--- a/com.epistimis.uddl/src/com/epistimis/uddl/UddlQNP.java
+++ b/com.epistimis.uddl/src/com/epistimis/uddl/UddlQNP.java
@@ -39,8 +39,7 @@ public class UddlQNP  extends  DefaultDeclarativeQualifiedNameProvider  { // Xba
 	
 	@Inject IndexUtilities ndxUtils;
 	// Because the base class one is private
-	@Inject
-	protected IQualifiedNameConverter converter = new IQualifiedNameConverter.DefaultImpl();
+	@Inject protected IQualifiedNameConverter converter = new IQualifiedNameConverter.DefaultImpl();
 	
 	@Inject protected QualifiedNameValueConverter qualifiedNameValueConverter = new QualifiedNameValueConverter();
 	
diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/UddlRuntimeModule.java b/com.epistimis.uddl/src/com/epistimis/uddl/UddlRuntimeModule.java
index 97d2562..3aa914e 100644
--- a/com.epistimis.uddl/src/com/epistimis/uddl/UddlRuntimeModule.java
+++ b/com.epistimis.uddl/src/com/epistimis/uddl/UddlRuntimeModule.java
@@ -70,12 +70,18 @@ public Class<? extends IValueConverterService> bindIValueConverterService() {
         return UddlValueConverters.class ;
     }
 	
+	// --------  Other providers --------------------------------
+	public Class<? extends com.epistimis.uddl.scoping.IPackageProvider> bindIPackageProvider() {
+		return UddlPackageProvider.class;
+	}
+
+	// --------  Epistimis Specific bindings --------------------------------
+	
 	/** 
 	 * Inject this if you want the additional methods provided by this QNP
 	 * @return
 	 */
 	public Class<? extends UddlQNP> bindUddlQNP() {
-		// TODO Auto-generated method stub
 		return UddlQNP.class;
 	}
 
@@ -144,10 +150,6 @@ public Class<? extends com.epistimis.uddl.extension.ConceptualEntityExt> bindCon
 		return ConceptualEntityExt.class;
 	}
 	
-	// --------  Other providers --------------------------------
-	public Class<? extends com.epistimis.uddl.scoping.IPackageProvider> bindIPackageProvider() {
-		return UddlPackageProvider.class;
-	}
 	
 	
 }