Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/FCKeditor.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/FCKeditor.java	(revision 3471)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/FCKeditor.java	(revision 3472)
@@ -205,5 +205,5 @@
 
 	/**
-	 * Gets an configuration option. See {@link FCKeditorConfig} for more
+	 * Returns a configuration option. See {@link FCKeditorConfig} for more
 	 * details.
 	 * 
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/Context.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/Context.java	(revision 3471)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/Context.java	(revision 3472)
@@ -32,11 +32,16 @@
 
 /**
- * Holds basic parameters and associated methods for each request.
- *
+ * Maintains base/common request parameters from the File Browser. The gain of
+ * this class is to provide abstracted and pre-processed access to common
+ * request parameters.
+ * <p>
+ * In the regular case, you will use an already created instance of this class.
+ * </p>
+ * 
  * @version $Id$
  */
 public class Context {
 	// This is just a helper class which has no relevance for the logger
-	private final Logger logger = LoggerFactory.getLogger(Dispatcher.class);
+	private static final Logger logger = LoggerFactory.getLogger(Dispatcher.class);
 	
 	private String typeStr;
@@ -44,4 +49,12 @@
 	private String currentFolderStr;
 	
+	/**
+	 * Sole class constructor. Takes in a request instance, processes parameters
+	 * and populates private fields which can be accessed through getters.<br />
+	 * This class will only be instantiated in {@link ThreadLocalData}.
+	 * 
+	 * @param request
+	 *            current user request instance
+	 */
 	protected Context(final HttpServletRequest request) {
 		commandStr = request.getParameter("Command");
@@ -64,5 +77,7 @@
 	
 	/**
-	 * @return the typeStr
+	 * Returns the type parameter of this context.
+	 * 
+	 * @return the type parameter of this context
 	 */
 	public String getTypeStr() {
@@ -70,25 +85,47 @@
 	}
 	
+	/**
+	 * Returns a default resource type instance for the type parameter.
+	 * 
+	 * @see ResourceType#getDefaultResourceType(String)
+	 * @return default resource type instance
+	 */
 	public ResourceType getDefaultResourceType() {
 		return ResourceType.getDefaultResourceType(typeStr);
 	}
-	
+
+	/**
+	 * Returns a resource type instance for the type parameter.
+	 * 
+	 * @see ResourceType#getResourceType(String)
+	 * @return resource type instance
+	 */
 	public ResourceType getResourceType() {
 		return ResourceType.getResourceType(typeStr);
 	}
-	
+
 	/**
-	 * @return the commandStr
+	 * Returns the command parameter of this context.
+	 * 
+	 * @return the command parameter of this context
 	 */
 	public String getCommandStr() {
 		return commandStr;
 	}
-	
+
+	/**
+	 * Returns a command instance for the command parameter.
+	 * 
+	 * @see Command#getCommand(String)
+	 * @return command instance
+	 */
 	public Command getCommand() {
-		return Command.valueOf(commandStr);
+		return Command.getCommand(commandStr);
 	}
 	
 	/**
-	 * @return the currentFolderStr
+	 * Returns the current folder parameter of this context.
+	 * 
+	 * @return the current folder parameter of this context
 	 */
 	public String getCurrentFolderStr() {
@@ -96,4 +133,5 @@
 	}
 	
+	/** Logs base/common request parameters. */
 	public void logBaseParameters() {
 		logger.debug("Parameter Command: {}", commandStr);