diff --git a/plugins/gpu/amd_gpu_ b/plugins/gpu/amd_gpu_
index ddfb812f..4f7095e0 100755
--- a/plugins/gpu/amd_gpu_
+++ b/plugins/gpu/amd_gpu_
@@ -27,7 +27,8 @@ This plugin uses the following configuration variables:
 
 =head2 DEFAULT CONFIGURATION
 
-The default configuration is to set "env.aticonfexec" to /usr/bin/aticonfig.
+The default configuration is to set "env.aticonfexec" to /usr/bin/aticonfig and
+assume warning and critical temperatures of 75 and 95 degrees celsius, respectively.
 
 =head2 EXAMPLE WILDCARD USAGE
 
@@ -35,6 +36,16 @@ C<ln -s /usr/share/munin/plugins/amd_gpu_ /etc/munin/plugins/amd_gpu_temp>
 
 ...will monitor the temperature of available AMD GPUs.
 
+=head1 TODO
+
+=over 4
+
+=item *
+
+Use multigraphs for multiple GPUs (http://munin-monitoring.org/wiki/MultigraphSampleOutput).
+
+=back
+
 =head1 AUTHOR
 
 Nuno Fachada
@@ -85,7 +96,6 @@ 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."
@@ -233,8 +243,4 @@ 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.
-
-
-
 
diff --git a/plugins/gpu/nvidia_gpu_ b/plugins/gpu/nvidia_gpu_
index f372fb7c..38d67377 100755
--- a/plugins/gpu/nvidia_gpu_
+++ b/plugins/gpu/nvidia_gpu_
@@ -22,7 +22,8 @@ This plugin uses the following configuration variables:
 
 =head2 DEFAULT CONFIGURATION
 
-The default configuration is to set "env.smiexec" to /usr/bin/nvidia-smi.
+The default configuration is to set "env.smiexec" to /usr/bin/nvidia-smi and
+assume warning and critical temperatures of 75 and 95 degrees celsius, respectively.
 
 =head2 EXAMPLE WILDCARD USAGE
 
@@ -30,6 +31,21 @@ C<ln -s /usr/share/munin/plugins/nvidia_gpu_ /etc/munin/plugins/nvidia_gpu_temp>
 
 ...will monitor the temperature of available GPUs.
 
+=head1 TODO
+
+=over 4
+
+=item *
+
+Add support for specific professional GPU features such as number of compute 
+processes, clocks, power draw, utilization, and so on.
+
+=item *
+
+Use multigraphs for multiple GPUs (http://munin-monitoring.org/wiki/MultigraphSampleOutput).
+
+=back
+
 =head1 AUTHOR
 
 Nuno Fachada
@@ -206,9 +222,5 @@ 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 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)
-
-