Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorInsertTag.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorInsertTag.java	(revision 6795)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorInsertTag.java	(revision 6796)
@@ -14,5 +14,5 @@
 
 /**
- * <ck:editor> tag code.
+ * <ckeditor:editor> tag code.
  * <b>Usage:</b>
  * <pre>&lt;ckeditor:editor basePath="../../ckeditor/" editor="editor1" /&gt;</pre>
@@ -52,5 +52,5 @@
 				resp.reset();
 				resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
-								"Problem with creating tag");
+								"Problem with tag creation.");
 			} catch (IOException e1) {
 				throw new JspException(e1);
@@ -72,6 +72,6 @@
 
 	/**
-	 * creates HTML code to insert textarea into page.
-	 * @return textarea code.
+	 * Creates HTML code to insert a textarea element into the page.
+	 * @return textarea code
 	 */
 	private String createTextareaTag() {
@@ -89,6 +89,6 @@
 
 	/**
-	 * Creates string from textarea attributes map.
-	 * @return textarea attributes string.
+	 * Creates a String object from the textarea attributes map.
+	 * @return textarea attributes String object
 	 */
 	private String createTextareaAttributesText() {
@@ -120,5 +120,5 @@
 
 	/**
-	 * @return the value
+	 * @return the String value
 	 */
 	public final String getValue() {
@@ -127,5 +127,5 @@
 
 	/**
-	 * @param value the value to set
+	 * @param value the String value to set
 	 */
 	public final void setValue(final String value) {
@@ -134,5 +134,5 @@
 	
 	/**
-	 * @return the textareaAttributes
+	 * @return the textarea attributes
 	 */
 	public final Map<String, String> getTextareaAttributes() {
@@ -141,5 +141,5 @@
 
 	/**
-	 * @param textareaAttr the textareaAttributes to set
+	 * @param textareaAttr the textarea attributes to set
 	 */
 	public final void setTextareaAttributes(final Map<String, String> textareaAttr) {
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceAllTag.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceAllTag.java	(revision 6795)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceAllTag.java	(revision 6796)
@@ -6,5 +6,5 @@
 
 /**
- * &lt;ck:repalceAll&gt; tag code.
+ * &lt;ckeditor:replaceAll&gt; tag code.
  * <b>Usage:</b>
  * <pre>&lt;ckeditor:replaceAll basePath="../../ckeditor/" /&gt;</pre>
@@ -51,5 +51,5 @@
 
 	/**
-	 * @return the className
+	 * @return the class name
 	 */
 	public final String getClassName() {
@@ -58,5 +58,5 @@
 
 	/**
-	 * @param className the className to set
+	 * @param className the class name to set
 	 */
 	public final void setClassName(final String className) {
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceTag.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceTag.java	(revision 6795)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorReplaceTag.java	(revision 6796)
@@ -7,7 +7,7 @@
 
 /**
- * &lt;ck:repalce&gt; tag code.
+ * &lt;ckeditor:replace&gt; tag code.
  * <b>Usage:</b>
- * <pre>&lt;ckeditor:replace  replace="editor1" basePath="../../ckeditor/" /&gt;</pre>
+ * <pre>&lt;ckeditor:replace replace="editor1" basePath="../../ckeditor/" /&gt;</pre>
  */
 public class CKEditorReplaceTag extends CKEditorTag {
@@ -37,5 +37,5 @@
 
 	/**
-	 * @return the replace
+	 * @return the name of the element to replace
 	 */
 	public final String getReplace() {
@@ -44,5 +44,5 @@
 
 	/**
-	 * @param replace the replace to set
+	 * @param replace the name of the replaced element to set
 	 */
 	public final void setReplace(final String replace) {
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorTag.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorTag.java	(revision 6795)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/CKEditorTag.java	(revision 6796)
@@ -64,5 +64,5 @@
 				resp.reset();
 				resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
-								"Problem with creating tag");
+								"Problem with tag creation.");
 				e.printStackTrace();
 			} catch (IOException e1) {
@@ -88,6 +88,6 @@
 	
 	/**
-	 * Method retruns standard tag output.
-	 * @param config config resolved to string
+	 * Returns standard tag output.
+	 * @param config configuration resolved to a string
 	 * @return tag standard output
 	 */
@@ -95,5 +95,5 @@
 	
 	/**
-	 * Init metod for tags.
+	 * Initialization method for tags.
 	 * @return include ckfinder.js code with attributes and additional code.
 	 */
@@ -124,6 +124,6 @@
 
 	/**
-	 * Checks if basePath contains "/" at the end and adds it if not.	
-	 * @return basePath or basePath with "/" added at the end.	 
+	 * Checks if basePath contains "/" at the end and adds it if it does not.	
+	 * @return basePath or basePath with "/" added at the end 
 	*/
 	private String getBasePath() {
@@ -143,5 +143,5 @@
 
 	/**
-	 * @return the timestamp
+	 * @return the timestamp attribute
 	 */
 	public final String getTimestamp() {
@@ -150,5 +150,5 @@
 
 	/**
-	 * @param timestamp the timestamp to set
+	 * @param timestamp the timestamp attribute to set
 	 */
 	public final void setTimestamp(final String timestamp) {
@@ -157,5 +157,5 @@
 
 	/**
-	 * @return the initialized
+	 * @return the initialized attribute
 	 */
 	public final boolean isInitialized() {
@@ -164,5 +164,5 @@
 
 	/**
-	 * @param initialized the initialized to set
+	 * @param initialized the initialized attribute to set
 	 */
 	public final void setInitialized(final boolean initialized) {
@@ -171,5 +171,5 @@
 
 	/**
-	 * @return the globalEvents
+	 * @return the globalEvents attribute
 	 */
 	public final GlobalEventHandler getGlobalEvents() {
@@ -178,5 +178,5 @@
 
 	/**
-	 * @param globalEvents the globalEvents to set
+	 * @param globalEvents the globalEvents attribute to set
 	 */
 	public final void setGlobalEvents(final GlobalEventHandler globalEvents) {
@@ -186,5 +186,5 @@
 
 	/**
-	 * @return the config
+	 * @return the config attribute
 	 */
 	public final CKEditorConfig getConfig() {
@@ -193,5 +193,5 @@
 
 	/**
-	 * @param config the config to set
+	 * @param config the config attribute to set
 	 */
 	public final void setConfig(final CKEditorConfig config) {
@@ -200,5 +200,5 @@
 	
 	/**
-	 * @return the events
+	 * @return the events attribute
 	 */
 	public final EventHandler getEvents() {
@@ -207,5 +207,5 @@
 
 	/**
-	 * @param events the events to set
+	 * @param events the events attribute to set
 	 */
 	public final void setEvents(final EventHandler events) {
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/EventHandler.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/EventHandler.java	(revision 6795)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/EventHandler.java	(revision 6796)
@@ -31,7 +31,7 @@
 	
 	/**
-	 * Adds global event listener.
+	 * Adds an event listener.
 	 * @param event Event name
-	 * @param jsCode Javascript anonymous function or function name
+	 * @param jsCode JavaScript anonymous function or a function name
 	 */
 	public void addEvent(final String event, final String jsCode) { 
@@ -43,6 +43,6 @@
 	
 	/**
-	 * Clear registered global event handlers.
-	 * @param event Event name, if null all event handlers will be removed (optional).
+	 * Clears registered event handlers.
+	 * @param event Event name. If null, all event handlers will be removed (optional).
 	 */
 	public void clearEventHandlers(final String event) {
@@ -58,5 +58,5 @@
 	/**
 	 * Gets all registered events.
-	 * @return all registered events.
+	 * @return all registered events
 	 */
 	public Map<String, Set<String>> getEvents() {
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/GlobalEventHandler.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/GlobalEventHandler.java	(revision 6795)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/GlobalEventHandler.java	(revision 6796)
@@ -16,5 +16,5 @@
  	GlobalEventHandler globalEventHandler = new GlobalEventHandler();
 	globalEventHandler.addEvent("dialogDefinition","function (ev) {  
-							alert(\"Loading dialog: \" + ev.data.name); }");
+							alert(\"Loading dialog window: \" + ev.data.name); }");
 	</pre>
  */
@@ -25,6 +25,6 @@
 	
 	/**
-	 * Resolves global events to String.
-	 * @return global events resolved to String.
+	 * Resolves global events to a String.
+	 * @return global events resolved to a String
 	 */
 	String returnGlobalEvents() {
Index: /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/TagHelper.java
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/TagHelper.java	(revision 6795)
+++ /CKEditor.Java/ckeditor-java-core/trunk/src/main/java/com/ckeditor/TagHelper.java	(revision 6796)
@@ -20,7 +20,7 @@
 	
 	/**
-	 * Wrap string with javascript tag.
-	 * @param input input string
-	 * @return input wrapped with javascript tag
+	 * Wraps a String with a JavaScript tag.
+	 * @param input input String
+	 * @return input wrapped with a JavaScript tag
 	 */
 	public static String script(final String input) {
@@ -34,8 +34,8 @@
 	
 	/**
-	 * Creates javascript code for include ckeditor.js.
-	 * @param basePath ckeditor base path
-	 * @param args script agruments.
-	 * @return javascript code
+	 * Creates JavaScript code for including ckeditor.js.
+	 * @param basePath CKEditor base path
+	 * @param args script agruments
+	 * @return JavaScript code
 	 */
 	public static String createCKEditorIncJS(final String basePath, final String args) {
@@ -45,7 +45,7 @@
 
 	/**
-	 * Provides a basic JSON support.
+	 * Provides basic JSON support.
 	 * @param o object to encode
-	 * @return encoded config object value
+	 * @return encoded configuration object value
 	 */
 	@SuppressWarnings("unchecked")
@@ -76,7 +76,7 @@
 	
 	/**
-	 * Provides a basic JSON support for String.
-	 * @param s string to encode
-	 * @return encoded config string value
+	 * Provides basic JSON support for String objects.
+	 * @param s String object to encode
+	 * @return encoded configuration String object value
 	 */
 	public static String jsEncode(final String s) {
@@ -92,7 +92,7 @@
 	
 	/**
-	 * Provides a basic JSON support for Number.
-	 * @param n Number to encode
-	 * @return encoded Number value
+	 * Provides basic JSON support for Number objects.
+	 * @param n Number object to encode
+	 * @return encoded Number object value
 	 */
 	public static String jsEncode(final Number n) {
@@ -101,7 +101,7 @@
 	
 	/**
-	 * Provides a basic JSON support for Boolean.
-	 * @param b boolean to encode
-	 * @return encoded boolean value
+	 * Provides basic JSON support for Boolean objects.
+	 * @param b Boolean object to encode
+	 * @return encoded Boolean object value
 	 */
 	public static String jsEncode(final Boolean b) {
@@ -110,7 +110,7 @@
 	
 	/**
-	 * Provides a basic JSON support for Map.
-	 * @param map map to encode
-	 * @return encoded map value
+	 * Provides basic JSON support for Map objects.
+	 * @param map Map object to encode
+	 * @return encoded Map object value
 	 */
 	public static String jsEncode(final Map<String, Object> map) {
@@ -130,7 +130,7 @@
 	
 	/**
-	 * Provides a basic JSON support for List.
-	 * @param list List to encode
-	 * @return encoded List value
+	 * Provides basic JSON support for List objects.
+	 * @param list List object to encode
+	 * @return encoded List object value
 	 */
 	public static String jsEncode(final List<Object> list) {
@@ -147,7 +147,7 @@
 	
 	/**
-	 * Provides a basic JSON support for config.
-	 * @param config config to encode
-	 * @return encoded config value
+	 * Provides basic JSON support for the configuration object.
+	 * @param config configuration object to encode
+	 * @return encoded configuration object value
 	 */
 	public static String jsEncode(final CKEditorConfig config) {
@@ -167,7 +167,7 @@
 	
 	/**
-	 * Clears string from special chars and quote it.
-	 * @param s input string
-	 * @return cleared string
+	 * Clears a String from special characters and quotes it.
+	 * @param s input String
+	 * @return cleared String
 	 */
 	private static String clearString(final String s) {