diff --git a/convex-cli/src/main/java/convex/cli/Main.java b/convex-cli/src/main/java/convex/cli/Main.java
index 81350329f..7ef5d08ea 100644
--- a/convex-cli/src/main/java/convex/cli/Main.java
+++ b/convex-cli/src/main/java/convex/cli/Main.java
@@ -30,6 +30,8 @@
 
 /**
  * Convex CLI implementation
+ * 
+ * This is the main `convex` command and root for child commands.
  */
 @Command(name = "convex", 
 		subcommands = { Account.class, Key.class, Local.class, Peer.class, Query.class, Status.class, Desktop.class,
@@ -161,7 +163,7 @@ private void setupVerbosity() {
 	/**
 	 * Version provider class
 	 */
-	public static final class VersionProvider implements IVersionProvider {
+	private static final class VersionProvider implements IVersionProvider {
 		@Override
 		public String[] getVersion() throws Exception {
 			String s = Main.class.getPackage().getImplementationVersion();
diff --git a/convex-core/src/main/java/convex/core/data/Syntax.java b/convex-core/src/main/java/convex/core/data/Syntax.java
index 0d12151c7..a7a684558 100644
--- a/convex-core/src/main/java/convex/core/data/Syntax.java
+++ b/convex-core/src/main/java/convex/core/data/Syntax.java
@@ -49,6 +49,7 @@ private Syntax(Ref<ACell> datumRef, AHashMap<ACell, ACell> props) {
 		this.meta = props;
 	}
 	
+	@Override
 	public AType getType() {
 		return Types.SYNTAX;
 	}
diff --git a/convex-core/src/main/java/convex/core/data/prim/ANumeric.java b/convex-core/src/main/java/convex/core/data/prim/ANumeric.java
index fd2ae21f9..8d15049cc 100644
--- a/convex-core/src/main/java/convex/core/data/prim/ANumeric.java
+++ b/convex-core/src/main/java/convex/core/data/prim/ANumeric.java
@@ -18,6 +18,7 @@ public abstract class ANumeric extends APrimitive implements Comparable<ANumeric
 	 */
 	public abstract CVMDouble toDouble();
 
+	@Override
 	public abstract double doubleValue();
 	
 	/**
diff --git a/convex-core/src/main/java/convex/core/data/prim/APrimitive.java b/convex-core/src/main/java/convex/core/data/prim/APrimitive.java
index 0f7f2eabf..509ef5b2a 100644
--- a/convex-core/src/main/java/convex/core/data/prim/APrimitive.java
+++ b/convex-core/src/main/java/convex/core/data/prim/APrimitive.java
@@ -7,6 +7,10 @@
 /**
  * Abstract base class for CVM primitive values.
  * 
+ * We don't use JVM primitives directly in CVM data structures because these primitives need to inherit 
+ * the basic ACell functionality, but these are otherwise relatively lightweight wrappers over the
+ * underlying JVM types.
+ * 
  */
 public abstract  class APrimitive extends ACell {
 	@Override
@@ -34,7 +38,7 @@ protected long calcMemorySize() {
 	}
 	
 	/**
-	 * @return Java long value representing this primitive CVM value
+	 * @return Java long value representing this primitive CVM value. Essentially equivalent to JVM cast.
 	 */
 	public abstract long longValue();