diff --git a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
index 5ae3ecfe7d4..2d31692179f 100644
--- a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.remote.ui;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.qualifier
 Bundle-Activator: org.eclipse.remote.internal.ui.RemoteUIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/bundles/org.eclipse.remote.ui/pom.xml b/bundles/org.eclipse.remote.ui/pom.xml
index 911bd199480..9699fe9d5a9 100644
--- a/bundles/org.eclipse.remote.ui/pom.xml
+++ b/bundles/org.eclipse.remote.ui/pom.xml
@@ -12,5 +12,5 @@
 
   <artifactId>org.eclipse.remote.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
-<version>2.1.0-SNAPSHOT</version>
+<version>2.1.1-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
index 5e1b463b782..30b689e2237 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
@@ -274,7 +274,7 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext {
 	 * text field, and in a future version should expand the browser to this
 	 * location if it exists.
 	 * 
-	 * @param path
+	 * @param path initial path
 	 */
 	public void setInitialPath(String path) {
 		fInitialPath = path;
@@ -283,7 +283,7 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext {
 	/**
 	 * Set the fDialogTitle of the dialog.
 	 * 
-	 * @param title
+	 * @param title title to display
 	 */
 	public void setTitle(String title) {
 		fDialogTitle = title;
@@ -308,7 +308,7 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext {
 	/**
 	 * Show available connections on browser if possible (default disabled).
 	 * 
-	 * @param enable
+	 * @param enable enable connection display if true
 	 */
 	public void showConnections(boolean enable) {
 		fShowConnections = enable;
@@ -317,7 +317,7 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext {
 	/**
 	 * Enable a checkbox to show hidden files (default enabled)
 	 * 
-	 * @param showHidden
+	 * @param showHidden show hidden files if true
 	 */
 	public void showHiddenCheckbox(boolean showHidden) {
 		fShowHiddenCheckbox = showHidden;
@@ -326,7 +326,7 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext {
 	/**
 	 * Enable selection of local files
 	 * 
-	 * @param showNewFolderButton
+	 * @param showLocalSelection show local files if true
 	 */
 	public void showLocalSelection(boolean showLocalSelection) {
 		fShowLocalSelection = showLocalSelection;
@@ -335,7 +335,7 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext {
 	/**
 	 * Enable a button to create new folders (default enabled)
 	 * 
-	 * @param showNewFolderButton
+	 * @param showNewFolderButton show new folder button if true
 	 */
 	public void showNewFolderButton(boolean showNewFolderButton) {
 		fShowNewFolderButton = showNewFolderButton;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
index 924c5ace956..521d4b4fdb0 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
@@ -176,8 +176,6 @@ public class RemoteConnectionWidget extends Composite {
 	 *            a combination of flags that modify the behavior of the widget.
 	 * @param context
 	 *            runnable context, or null
-	 * @param connnectionTypes
-	 *            list of connection types to select from
 	 * @since 2.0
 	 */
 	public RemoteConnectionWidget(Composite parent, int style, String title, int flags, IRunnableContext context) {
@@ -217,7 +215,7 @@ public class RemoteConnectionWidget extends Composite {
 	 *            a combination of flags that modify the behavior of the widget.
 	 * @param context
 	 *            runnable context, or null
-	 * @param connnectionTypes
+	 * @param connectionTypes
 	 *            list of connection types to select from
 	 * @since 2.0
 	 */
@@ -401,8 +399,6 @@ public class RemoteConnectionWidget extends Composite {
 
 	/**
 	 * Handle the section of a new connection. Update connection option buttons appropriately.
-	 * 
-	 * @throws CoreException
 	 */
 	protected void handleConnectionSelected() {
 		final boolean enabled = fWidgetListener.isEnabled();
@@ -432,8 +428,6 @@ public class RemoteConnectionWidget extends Composite {
 	 * connection combo with the new connection.
 	 * 
 	 * TODO should probably select the new connection
-	 * 
-	 * @throws CoreException
 	 */
 	protected void handleNewRemoteConnectionSelected() {
 		if (getUIConnectionManager() != null) {
@@ -461,7 +455,6 @@ public class RemoteConnectionWidget extends Composite {
 	 * 
 	 * @param conn
 	 *            connection to select as current. If conn is null, select the first item in the list.
-	 * @throws CoreException
 	 * @since 2.0
 	 */
 	protected void handleConnectionTypeSelected(IRemoteConnection conn) {
@@ -543,7 +536,6 @@ public class RemoteConnectionWidget extends Composite {
 
 	/**
 	 * Initialize the contents of the connection type combo. Keeps an array of connection types that matches the combo elements.
-	 * Returns the id of the selected element.
 	 * 
 	 * @since 2.0
 	 */
@@ -622,7 +614,6 @@ public class RemoteConnectionWidget extends Composite {
 	 *            connection type id
 	 * @param name
 	 *            connection name
-	 * @throws CoreException
 	 * @since 6.0
 	 */
 	public void setConnection(String id, String name) {