diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSFileTransferImp.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSFileTransferImp.java
index c48e2e04997072c829637e73ea714104aea68682..5cbaf90c68a5b762795ae6b58365bcfdf7948ab1 100644
--- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSFileTransferImp.java
+++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSFileTransferImp.java
@@ -104,7 +104,7 @@ class HaaSFileTransferImp implements HaaSFileTransfer {
 
 	}
 
-	// TASK merge with download - stream provider for file, consumer for stream
+	// FIXME: merge with download - stream provider for file, consumer for stream
 	@Override
 	public List<String> getContent(List<String> files) {
 		List<String> result = new LinkedList<>();
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
index 0c4d392560477f31c140c39f89d1a58866e6e18e..4aacf63016dd8d92ee92a6c8fcbbd9dd09ae74e1 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
@@ -16,6 +16,7 @@ import com.google.common.collect.Streams;
 import cz.it4i.fiji.haas_java_client.JobState;
 import cz.it4i.fiji.haas_java_client.SynchronizableFileType;
 
+//FIXME: TaskComputation 'done' should be Finished not Queued
 public class TaskComputation {
 
 	public static class Log {
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java
index f37db8a9c56063fac653c913bbfe1bc9aa973fd8..2dd990dff6715ed43d07a51a4025464dcca57d4e 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java
@@ -41,7 +41,7 @@ import javafx.scene.control.TableView;
 import javafx.scene.layout.BorderPane;
 import net.imagej.updater.util.Progress;
 
-//TASK: fix Exception during context menu request on task with N/A state
+//FIXME: fix Exception during context menu request on task with N/A state
 public class BenchmarkSPIMController extends BorderPane implements CloseableControl, InitiableControl {
 
 	@FXML
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java
index 5b2d5efc55fb6cd9d054613b873ef6b546e730f1..40c7fa85d825b3ffe1f06f9f96ea20156bcfea8e 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java
@@ -16,7 +16,7 @@ import cz.it4i.fiji.haas_spim_benchmark.core.TaskComputation;
 import cz.it4i.fiji.haas_spim_benchmark.core.TaskComputation.Log;
 import javafx.beans.value.ObservableValue;
 import javafx.beans.value.ObservableValueBase;
-//TASK: improve performance
+
 public class TaskComputationAdapter implements Closeable {
 
 	public final static Logger log = LoggerFactory