diff --git a/plugins/gpu/amd_gpu_ b/plugins/gpu/amd_gpu_
index bd4c8af1..2945cbd9 100755
--- a/plugins/gpu/amd_gpu_
+++ b/plugins/gpu/amd_gpu_
@@ -83,6 +83,7 @@ nGpusOutput=`$atiConfigExec --list-adapters`
 
 nGpus=`echo "$nGpusOutput" | wc -l`
 nGpus=$((nGpus - 2)) # Last two lines don't matter
+# FIXME Possible bug in code bellow: maybe should be <= 0 instead of == 0?
 if [ $nGpus -eq 0 ]; then
 	# Exit if no GPUs found
 	echo "No AMD GPUs detected. Exiting."
@@ -230,6 +231,9 @@ do
 	: $(( nGpusCounter = $nGpusCounter + 1 ))
 done
 
+# TODO Follow multigraph suggestion from Flameeyes to look into multigraph plugins http://munin-monitoring.org/wiki/MultigraphSampleOutput, in order to reduce the amount of round trips to get the data.
+# TODO Put warning and critical as vars in config with sensible defaults
+
 
 
 
diff --git a/plugins/gpu/nvidia_gpu_ b/plugins/gpu/nvidia_gpu_
index a43f5989..df4db473 100755
--- a/plugins/gpu/nvidia_gpu_
+++ b/plugins/gpu/nvidia_gpu_
@@ -204,5 +204,11 @@ do
 	: $(( nGpusCounter = $nGpusCounter + 1 ))
 done
 
+# TODO Follow multigraph suggestion from Flameeyes to look into multigraph plugins http://munin-monitoring.org/wiki/MultigraphSampleOutput, in order to reduce the amount of round trips to get the data.
+# TODO Put warning and critical as vars in config with sensible defaults
+
+# TODO Nvidia only: Add unsupported output options from nvidia-smi for those who have that option (how to test?). Test if they are supported and put them in suggest (or not) in case they are supported (or not)
+
+