diff --git a/modules/ui/org.eclipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/Util.java b/modules/ui/org.eclipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/Util.java
index a79847330..1932a5b85 100644
--- a/modules/ui/org.eclipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/Util.java
+++ b/modules/ui/org.eclipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/Util.java
@@ -713,7 +713,7 @@ public static BooleanProperty createPseudoClassProperty(String pseudoClass, Node
 
 	/**
 	 * Run the provided runnable when the event occurs
-	 * 
+	 * @param <E> event type
 	 * @param r
 	 *            the runnable
 	 * @return the event handler
@@ -727,6 +727,7 @@ public static <E extends Event> EventHandler<E> onEvent(Runnable r) {
 	 * Run the provided supplier when the event occurs and if true is returned
 	 * consume the event
 	 * 
+	 * @param <E> event type
 	 * @param r
 	 *            the supplier
 	 * @return the event handler
diff --git a/modules/ui/org.eclipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/scroll/ScrollView.java b/modules/ui/org.eclipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/scroll/ScrollView.java
deleted file mode 100644
index a8b5d2648..000000000
--- a/modules/ui/org.eclipse.fx.ui.controls/src/main/java/org/eclipse/fx/ui/controls/scroll/ScrollView.java
+++ /dev/null
@@ -1,47 +0,0 @@
-///*******************************************************************************
-// * Copyright (c) 2019 BestSolution.at and others.
-// * All rights reserved. This program and the accompanying materials
-// * are made available under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available at
-// * http://www.eclipse.org/legal/epl-v10.html
-// *
-// * Contributors:
-// *     Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation
-// *******************************************************************************/
-//package org.eclipse.fx.ui.controls.scroll;
-//
-//import javafx.geometry.Orientation;
-//import javafx.scene.Node;
-//import javafx.scene.control.ScrollBar;
-//import javafx.scene.input.ScrollEvent;
-//import javafx.scene.layout.Region;
-//import javafx.scene.layout.StackPane;
-//
-//public abstract class ScrollView extends Region {
-//	private final ScrollBar vScrollbar;
-//	private final ScrollBar hScrollbar;
-//	private final ClipPane clipPane;
-//	
-//	public ScrollView() {
-//		this.vScrollbar = new ScrollBar();
-//		this.vScrollbar.setOrientation(Orientation.VERTICAL);
-//		
-//		this.hScrollbar = new ScrollBar();
-//		this.hScrollbar.setOrientation(Orientation.HORIZONTAL);
-//		
-//		this.clipPane = new ClipPane();
-////		this.clipPane.addEventHandler(ScrollEvent.SCROLL, eventHandler);
-//		getChildren().addAll(this.clipPane, this.hScrollbar, this.vScrollbar);
-//	}
-//	
-//	class ClipPane extends StackPane {
-//		
-//	}
-//	
-//	protected abstract <T extends Node & ScrolledContent> ScrolledContent createContent();
-//	
-//	public interface ScrolledContent {
-//		public double computeContentHeight(double width);
-//		public double computeContentWidth(double height);
-//	}
-//}
diff --git a/modules/ui/org.eclipse.fx.ui.databinding/src/main/java/org/eclipse/fx/ui/databinding/JFXUIProperties.java b/modules/ui/org.eclipse.fx.ui.databinding/src/main/java/org/eclipse/fx/ui/databinding/JFXUIProperties.java
index ca86f4dad..c268ee7e3 100755
--- a/modules/ui/org.eclipse.fx.ui.databinding/src/main/java/org/eclipse/fx/ui/databinding/JFXUIProperties.java
+++ b/modules/ui/org.eclipse.fx.ui.databinding/src/main/java/org/eclipse/fx/ui/databinding/JFXUIProperties.java
@@ -40,7 +40,8 @@ public class JFXUIProperties {
 	 * <li>{@link TreeView}</li>
 	 * <li>{@link TreeTableView}</li>
 	 * </ul>
-	 *
+	 * @param <S> type of the source object
+	 * @param <T> type of the value of the property
 	 * @return the property
 	 */
 	@NonNull
@@ -49,6 +50,7 @@ public class JFXUIProperties {
 	}
 
 	/**
+	 * @param <T> type of the value of the property
 	 * @return single selection property for {@link ListView}
 	 * @since 3.0.0
 	 */
@@ -58,6 +60,7 @@ public static <T> IJFXControlValueProperty<ListView<T>,T> singleListViewSelectio
 	}
 
 	/**
+	 * @param <T> type of the value of the property
 	 * @return single selection property for {@link ComboBox}
 	 * @since 3.0.0
 	 */
@@ -67,6 +70,7 @@ public static <T> IJFXControlValueProperty<ComboBox<T>,T> singleComboBoxSelectio
 	}
 
 	/**
+	 * @param <T> type of the value of the property
 	 * @return single selection property for {@link TreeView}
 	 * @since 3.0.0
 	 */
@@ -76,6 +80,7 @@ public static <T> IJFXControlValueProperty<TreeTableView<T>,T> singleTreeTableVi
 	}
 
 	/**
+	 * @param <T> type of the value of the property
 	 * @return single selection property for {@link TreeView}
 	 * @since 3.0.0
 	 */
@@ -86,7 +91,7 @@ public static <T> IJFXControlValueProperty<TreeView<T>,T> singleTreeViewSelectio
 
 	/**
 	 * Create a property for the text-property of a javafx bean
-	 *
+	 * @param <S> the source type
 	 * @return the text property
 	 * @since 2.4.0
 	 */
@@ -142,7 +147,7 @@ public static IJFXControlValueProperty<Tab,String> tabText() {
 
 	/**
 	 * Create a date property of the {@link DatePicker}
-	 *
+	 * @param <S> the source type
 	 * @return the property
 	 */
 	@NonNull
diff --git a/modules/ui/org.eclipse.fx.ui.databinding/src/main/java/org/eclipse/fx/ui/databinding/internal/ControlObservableValueDecorator.java b/modules/ui/org.eclipse.fx.ui.databinding/src/main/java/org/eclipse/fx/ui/databinding/internal/ControlObservableValueDecorator.java
index 8a457138f..df8669284 100644
--- a/modules/ui/org.eclipse.fx.ui.databinding/src/main/java/org/eclipse/fx/ui/databinding/internal/ControlObservableValueDecorator.java
+++ b/modules/ui/org.eclipse.fx.ui.databinding/src/main/java/org/eclipse/fx/ui/databinding/internal/ControlObservableValueDecorator.java
@@ -17,9 +17,6 @@
 @SuppressWarnings("javadoc")
 public class ControlObservableValueDecorator<T> extends DecoratingObservableValue<T> implements IJFXControlValueObservable<T> {
 
-	/**
-	 * @param decorated
-	 */
 	public ControlObservableValueDecorator(IObservableValue<T> decorated) {
 		super(decorated, true);
 	}
diff --git a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLBuilder.java b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLBuilder.java
index 745d8b116..465cbfc02 100755
--- a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLBuilder.java
+++ b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLBuilder.java
@@ -58,7 +58,7 @@ public interface FXMLBuilder<N> {
 
 	/**
 	 * Load the FXML and return the root node and the controller
-	 * 
+	 * @param <C> the controller type
 	 * @return a structure holding root node and controller
 	 * @throws IOException
 	 *             if there is a problem loading the fxml
diff --git a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoader.java b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoader.java
index de9debfdd..f5f1e6b66 100755
--- a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoader.java
+++ b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoader.java
@@ -23,7 +23,7 @@
 /**
  * Annotation to mark an injection of an {@link FXMLLoaderFactory}
  *
- * @Deprecated Use @LocalInstance {@link javafx.fxml.FXMLLoader} instead
+ * Deprecated Use @LocalInstance {@link javafx.fxml.FXMLLoader} instead
  */
 @Qualifier
 @Documented
@@ -34,6 +34,7 @@
 	/**
 	 * If set to true the {@link ExtendedFXMLLoader} will be used and
 	 * {@link FXMLBuilder#builderFactory(javafx.util.BuilderFactory)} is ignored
+	 * @return <code>true</code> to use an extended loader
 	 */
 	boolean useExtendedLoader() default false;
 }
diff --git a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoaderFactory.java b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoaderFactory.java
index f9ad5b276..412815768 100755
--- a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoaderFactory.java
+++ b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoaderFactory.java
@@ -30,7 +30,7 @@ public interface FXMLLoaderFactory {
 	/**
 	 * Load the fxml file relative to the bundle the loading class is in,
 	 * similar to pure java {@link ClassLoader#getResource(String)}
-	 *
+	 * @param <N> the root type
 	 * @param relativePath
 	 *            the relative path to the bundle classpath
 	 * @return the builder
@@ -41,7 +41,7 @@ public interface FXMLLoaderFactory {
 	/**
 	 * Load the fxml file relative to the class requesting the loading, similar
 	 * to pure java {@link Class#getResource(String)}
-	 *
+	 * @param <N> the root type
 	 * @param relativePath
 	 *            the relative path from the class
 	 * @return the builder
@@ -51,7 +51,7 @@ public interface FXMLLoaderFactory {
 
 	/**
 	 * Load the fxml file from the given input stream
-	 *
+	 * @param <N> the root type
 	 * @param stream
 	 *            the stream
 	 * @param path
@@ -64,7 +64,7 @@ public interface FXMLLoaderFactory {
 
 	/**
 	 * Load the fxml file from the given url
-	 *
+	 * @param <N> the root type
 	 * @param url
 	 *            the url
 	 * @return the builder
diff --git a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/InjectingFXMLLoader.java b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/InjectingFXMLLoader.java
index 153299adc..f6b786b47 100755
--- a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/InjectingFXMLLoader.java
+++ b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/InjectingFXMLLoader.java
@@ -46,7 +46,7 @@ public abstract class InjectingFXMLLoader<N> implements FXMLBuilder<N> {
 
 	/**
 	 * Create a loader which operates relative to the requestor
-	 *
+	 * @param <N> the root type
 	 * @param context
 	 *            the di context
 	 * @param requester
@@ -63,7 +63,7 @@ public static <N> InjectingFXMLLoader<N> create(@NonNull final IEclipseContext c
 	/**
 	 * Create a loader which operates relative to the requestor and uses the
 	 * {@link ExtendedFXMLLoader} if requested to do so
-	 *
+	 * @param <N> the root type
 	 * @param context
 	 *            the di context
 	 * @param requester
@@ -113,7 +113,7 @@ public N getNode() {
 
 	/**
 	 * Create a loader which operates relative to the bundle classpath
-	 *
+	 * @param <N> the root type
 	 * @param context
 	 *            the di context
 	 * @param bundle
@@ -129,7 +129,7 @@ public static <N> InjectingFXMLLoader<N> create(@NonNull final IEclipseContext c
 	/**
 	 * Create a loader which operates relative to the bundle classpath and uses
 	 * the {@link ExtendedFXMLLoader} if requested to do so
-	 *
+	 * @param <N> the root type
 	 * @param context
 	 *            the di context
 	 * @param bundle
@@ -208,7 +208,7 @@ public N getNode() {
 
 	/**
 	 * Create a loader which uses the given classloader
-	 *
+	 * @param <N> the root type
 	 * @param context
 	 *            the di context
 	 * @param classloader
@@ -251,7 +251,7 @@ public N getNode() {
 
 	/**
 	 * Create a loader which uses a give classloader and reads from the stream
-	 *
+	 * @param <N> the root type
 	 * @param context
 	 *            the di context
 	 * @param classloader
diff --git a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/Util.java b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/Util.java
index 41d8b3bf7..db6c43e23 100755
--- a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/Util.java
+++ b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/Util.java
@@ -23,7 +23,7 @@
 public abstract class Util<T> {
 	/**
 	 * Wrap a give callback to always run on the javafx threa
-	 * 
+	 * @param <T> the value type
 	 * @param callback
 	 *            the callback
 	 * @return a wrapped callback
@@ -51,7 +51,7 @@ public void run() {
 		};
 	}
 
-	static abstract class SyncCallback<T> implements Callback<T> {
+	abstract static class SyncCallback<T> implements Callback<T> {
 		// nothing to to do
 	}
 }
diff --git a/modules/ui/org.eclipse.fx.ui.dialogs/src/main/java/org/eclipse/fx/ui/dialogs/TaskProgressDialog.java b/modules/ui/org.eclipse.fx.ui.dialogs/src/main/java/org/eclipse/fx/ui/dialogs/TaskProgressDialog.java
index 23d8a97fd..51022dbd4 100644
--- a/modules/ui/org.eclipse.fx.ui.dialogs/src/main/java/org/eclipse/fx/ui/dialogs/TaskProgressDialog.java
+++ b/modules/ui/org.eclipse.fx.ui.dialogs/src/main/java/org/eclipse/fx/ui/dialogs/TaskProgressDialog.java
@@ -30,12 +30,12 @@
 import javafx.stage.Stage;
 
 /**
- * @param <R>
+ * @param <R> the result type
  */
 public class TaskProgressDialog<R> extends Dialog<R> {
 	
 	/**
-	 * @param <T>
+	 * @param <T> the value type
 	 */
 	@FunctionalInterface
 	public interface CancelledHandler<T> {
@@ -47,7 +47,7 @@ public interface CancelledHandler<T> {
 	}
 	
 	/**
-	 * @param <T>
+	 * @param <T> the value type 
 	 */
 	@FunctionalInterface
 	public interface FailedHandler<T> {