diff --git a/nsis/src/plugin-resources/templates/setup.jelly b/nsis/src/plugin-resources/templates/setup.jelly
index ccab1ae7..1aa755e0 100644
--- a/nsis/src/plugin-resources/templates/setup.jelly
+++ b/nsis/src/plugin-resources/templates/setup.jelly
@@ -75,6 +75,7 @@ Section "${PROJECT_NAME} v${PROJECT_VERSION} Binaries"
   WriteRegStr HKLM "${PROJECT_REG_KEY}" "Install_Dir" "$INSTDIR"
   
   ; Write the environment variables to the Registry
+  ; FIXME: This should be a project include.
   ; ${MAVEN_HOME}
   Push "MAVEN_HOME"
   Push "$INSTDIR"
@@ -93,8 +94,8 @@ SectionEnd
 ; -------------------------------------------------------------- Create Shortcuts
 Section "Create Start Menu Shortcut(s)"
   CreateDirectory "${PROJECT_STARTMENU_FOLDER}"
-;  it would be nice to get all this from navigation.xml :-)
-; FIXME: need to use an include for this.
+; it would be nice to get all this from navigation.xml :-)
+; FIXME: This should be a project include.
   CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Maven.lnk" "$INSTDIR\bin\maven.bat" "" "$INSTDIR\bin\maven.bat" 0
   CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Install Maven Repository.lnk" "$INSTDIR\bin\install_repo.bat" "" "$INSTDIR\install_repo.bat" 0
   CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Uninstall.lnk" "$INSTDIR\Uninst.exe" "" "$INSTDIR\Uninst.exe" 0
@@ -107,6 +108,7 @@ Section "Create Start Menu Shortcut(s)"
   CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Frequently Asked Questions.lnk" "http://maven.apache.org/faq.html"
 SectionEnd
 
+; FIXME: This should be a project include.
 ; OPTIONAL Desktop Shortcut 
 ; Section "Create Desktop Shortcut"
 ;  CreateShortCut "$DESKTOP\Maven.lnk" "$INSTDIR\bin\maven.bat" "" "$INSTDIR\bin\maven.bat"
@@ -124,6 +126,7 @@ Section "Uninstall"
   DeleteRegKey HKLM "${PROJECT_REG_UNINSTALL_KEY}"
   DeleteRegKey HKLM "${PROJECT_REG_KEY}"
 
+  ; FIXME: This should be a project include.
   ; Remove ${MAVEN_HOME}
   Push "MAVEN_HOME"
   Call un.DeleteEnvStr
@@ -141,7 +144,7 @@ Section "Uninstall"
   ; Recursively remove files and directories used
   ; this should also take care of the installer  
   RMDir /r "$INSTDIR"
-  ; MessageBox MB_OK|MB_ICONEXCLAMATION "Maven has been 'Uninstalled'"
+  MessageBox MB_OK|MB_ICONEXCLAMATION "${PROJECT_NAME} has been uninstalled"
 SectionEnd
 
 ; -------------------------------------------------------------- Add Images to the Installer / UnInstaller