diff --git a/src/main/java/com/thedeanda/ajaxproxy/MergeCode.java b/src/main/java/com/thedeanda/ajaxproxy/MergeCode.java
index 5b323f7b..1ecc4fe0 100644
--- a/src/main/java/com/thedeanda/ajaxproxy/MergeCode.java
+++ b/src/main/java/com/thedeanda/ajaxproxy/MergeCode.java
@@ -36,16 +36,6 @@ public MergeCode() {
 
 	}
 
-	/**
-	 * 
-	 * @param filePath
-	 *            input file with lines that contain filenames to merge
-	 * @param minify
-	 * @param jsMode
-	 *            true when minifying javascript, false for css
-	 * @return
-	 * @throws Exception
-	 */
 	public String mergeContents() throws Exception {
 		StringBuffer sb = new StringBuffer();
 		if (mode == MergeMode.HTML_JSON) {
diff --git a/src/main/java/com/thedeanda/ajaxproxy/ui/MainPanel.java b/src/main/java/com/thedeanda/ajaxproxy/ui/MainPanel.java
index b5e1e05f..8034c618 100644
--- a/src/main/java/com/thedeanda/ajaxproxy/ui/MainPanel.java
+++ b/src/main/java/com/thedeanda/ajaxproxy/ui/MainPanel.java
@@ -168,7 +168,11 @@ private void fireProxyStopped() {
 		}
 	}
 
-	/** updates the config from the ui data */
+	/**
+	 * updates the config from the ui data
+	 * 
+	 * @return the json object representing the config
+	 */
 	public JsonObject getConfig() {
 		JsonObject json = config;
 		json.put("port", generalPanel.getPort());
diff --git a/src/main/java/org/fife/ui/hex/swing/HexEditor.java b/src/main/java/org/fife/ui/hex/swing/HexEditor.java
index fcc66691..a2c98594 100644
--- a/src/main/java/org/fife/ui/hex/swing/HexEditor.java
+++ b/src/main/java/org/fife/ui/hex/swing/HexEditor.java
@@ -485,7 +485,7 @@ public void replaceBytes(int offset, int len, byte[] bytes) {
 
 
 	/**
-	 * Replaces the currently selected bytes (if >=1) with the specified
+	 * Replaces the currently selected bytes (if greater or equal to 1) with the specified
 	 * new bytes.
 	 *
 	 * @param bytes The new bytes.  If this is <code>null</code> or an empty
diff --git a/src/main/java/org/slf4j/impl/ListenerSupportedSimpleLogger.java b/src/main/java/org/slf4j/impl/ListenerSupportedSimpleLogger.java
index 8dbc639b..e51ec011 100644
--- a/src/main/java/org/slf4j/impl/ListenerSupportedSimpleLogger.java
+++ b/src/main/java/org/slf4j/impl/ListenerSupportedSimpleLogger.java
@@ -488,6 +488,7 @@ private void formatAndLog(int level, String format, Object... arguments) {
 	 *
 	 * @param logLevel
 	 *            is this level enabled?
+	 * @return true if level is enabled 
 	 */
 	protected boolean isLevelEnabled(int logLevel) {
 		// log level are numerically ordered so can use simple numeric