diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dfc21001..7b4011cbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,22 +111,22 @@ IF(WANT_QT5)
 ELSE()
 	SET(QT5 FALSE)
 
-# check for Qt4
-SET(QT_MIN_VERSION "4.6.0" COMPONENTS QtCore QtGui QtXml)
-FIND_PACKAGE(Qt4 REQUIRED)
-SET(QT_USE_QTXML 1)
-EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_TRANSLATIONS" OUTPUT_VARIABLE QT_TRANSLATIONS_DIR)
-IF(WIN32)
-	SET(QT_TRANSLATIONS_DIR "${MINGW_PREFIX}/share/qt4/translations/")
-ENDIF(WIN32)
-IF(EXISTS "${QT_TRANSLATIONS_DIR}")
-	MESSAGE("-- Found Qt translations in ${QT_TRANSLATIONS_DIR}")
-	ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"')
-ENDIF(EXISTS "${QT_TRANSLATIONS_DIR}")
-IF(NOT WIN32)
-	STRING(REPLACE "-DQT_DLL" "" QT_DEFINITIONS "${QT_DEFINITIONS}")
-ENDIF(NOT WIN32)
-INCLUDE("${QT_USE_FILE}")
+	# check for Qt4
+	SET(QT_MIN_VERSION "4.6.0" COMPONENTS QtCore QtGui QtXml)
+	FIND_PACKAGE(Qt4 REQUIRED)
+	SET(QT_USE_QTXML 1)
+	EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_TRANSLATIONS" OUTPUT_VARIABLE QT_TRANSLATIONS_DIR)
+	IF(WIN32)
+		SET(QT_TRANSLATIONS_DIR "${MINGW_PREFIX}/share/qt4/translations/")
+	ENDIF(WIN32)
+	IF(EXISTS "${QT_TRANSLATIONS_DIR}")
+		MESSAGE("-- Found Qt translations in ${QT_TRANSLATIONS_DIR}")
+		ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"')
+	ENDIF(EXISTS "${QT_TRANSLATIONS_DIR}")
+	IF(NOT WIN32)
+		STRING(REPLACE "-DQT_DLL" "" QT_DEFINITIONS "${QT_DEFINITIONS}")
+	ENDIF(NOT WIN32)
+	INCLUDE("${QT_USE_FILE}")
 ENDIF()
 
 # check for libsndfile
@@ -136,38 +136,38 @@ IF(NOT SNDFILE_FOUND)
 ENDIF(NOT SNDFILE_FOUND)
 
 IF(WANT_CALF)
-SET(LMMS_HAVE_CALF TRUE)
-SET(STATUS_CALF "OK")
+	SET(LMMS_HAVE_CALF TRUE)
+	SET(STATUS_CALF "OK")
 ELSE(WANT_CALF)
-SET(STATUS_CALF "not built as requested")
+	SET(STATUS_CALF "not built as requested")
 ENDIF(WANT_CALF)
 
 IF(WANT_CAPS)
-SET(LMMS_HAVE_CAPS TRUE)
-SET(STATUS_CAPS "OK")
+	SET(LMMS_HAVE_CAPS TRUE)
+	SET(STATUS_CAPS "OK")
 ELSE(WANT_CAPS)
-SET(STATUS_CAPS "not built as requested")
+	SET(STATUS_CAPS "not built as requested")
 ENDIF(WANT_CAPS)
 
 IF(WANT_CMT)
-SET(LMMS_HAVE_CMT TRUE)
-SET(STATUS_CMT "OK")
+	SET(LMMS_HAVE_CMT TRUE)
+	SET(STATUS_CMT "OK")
 ELSE(WANT_CMT)
-SET(STATUS_CMT "not built as requested")
+	SET(STATUS_CMT "not built as requested")
 ENDIF(WANT_CMT)
 
 IF(WANT_SWH)
-SET(LMMS_HAVE_SWH TRUE)
-SET(STATUS_SWH "OK")
+	SET(LMMS_HAVE_SWH TRUE)
+	SET(STATUS_SWH "OK")
 ELSE(WANT_SWH)
-SET(STATUS_SWH "not built as requested")
+	SET(STATUS_SWH "not built as requested")
 ENDIF(WANT_SWH)
 
 IF(WANT_TAP)
-SET(LMMS_HAVE_TAP TRUE)
-SET(STATUS_TAP "OK")
+	SET(LMMS_HAVE_TAP TRUE)
+	SET(STATUS_TAP "OK")
 ELSE(WANT_TAP)
-SET(STATUS_TAP "not built as requested")
+	SET(STATUS_TAP "not built as requested")
 ENDIF(WANT_TAP)
 
 
@@ -358,7 +358,7 @@ ENDIF()
 
 SET(CMAKE_C_FLAGS "-O2 -g ${WERROR_FLAGS} ${CMAKE_C_FLAGS}")
 SET(CMAKE_CXX_FLAGS "-O2 -g -fno-exceptions ${WERROR_FLAGS} ${CMAKE_CXX_FLAGS}")
-set(CMAKE_C_FLAGS_DEBUG "-DLMMS_DEBUG")
+SET(CMAKE_C_FLAGS_DEBUG "-DLMMS_DEBUG")
 
 
 # people simply updating git will still have this and mess up build with it
@@ -385,11 +385,11 @@ ENDIF(GIT_FOUND)
 SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}")
 
 IF(QT5)
-QT5_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw -I${CMAKE_BINARY_DIR})
-QT5_WRAP_UI(lmms_UI_out ${lmms_UI})
+	QT5_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw -I${CMAKE_BINARY_DIR})
+	QT5_WRAP_UI(lmms_UI_out ${lmms_UI})
 ELSE()
-QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw -I${CMAKE_BINARY_DIR})
-QT4_WRAP_UI(lmms_UI_out ${lmms_UI})
+	QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw -I${CMAKE_BINARY_DIR})
+	QT4_WRAP_UI(lmms_UI_out ${lmms_UI})
 ENDIF()
 
 # embedded resources stuff
@@ -667,13 +667,13 @@ INCLUDE(InstallRequiredSystemLibraries)
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LMMS - easy music production for everyone!")
 SET(CPACK_PACKAGE_VENDOR "LMMS Developers")
 IF(LMMS_BUILD_APPLE)
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/README" "${CMAKE_BINARY_DIR}/README.txt" COPYONLY)
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_BINARY_DIR}/COPYING.txt" COPYONLY)
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_BINARY_DIR}/README.txt")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/COPYING.txt")
+	CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/README" "${CMAKE_BINARY_DIR}/README.txt" COPYONLY)
+	CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_BINARY_DIR}/COPYING.txt" COPYONLY)
+	SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_BINARY_DIR}/README.txt")
+	SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/COPYING.txt")
 ELSE(LMMS_BUILD_APPLE)
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+	SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+	SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 ENDIF(LMMS_BUILD_APPLE)
 
 SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
@@ -684,30 +684,30 @@ IF(VERSION_SUFFIX)
 ENDIF(VERSION_SUFFIX)
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LMMS")
 IF(WIN32)
-SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/nsis_branding.bmp")
-SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/data/lmms.ico")
-SET(CPACK_NSIS_INSTALLED_ICON_NAME "lmms.exe")
-SET(CPACK_NSIS_DISPLAY_NAME "LMMS ${VERSION}")
-SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lmms.io")
-SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lmms.io")
-SET(CPACK_NSIS_CONTACT "lmms-devel@lists.sourceforge.net")
-SET(CPACK_PACKAGE_EXECUTABLES "lmms.exe;LMMS")
-SET(CPACK_NSIS_MENU_LINKS "lmms.exe;LMMS")
-SET(CPACK_NSIS_DEFINES "!include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh")
-SET(CPACK_PACKAGE_FILE_NAME "lmms-${VERSION}-win32")
-SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmp\\\" \\\"LMMS Project\\\"
-  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
-  ")
-SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
-  \\\${unregisterExtension} \\\".mmp\\\" \\\"LMMS Project\\\"
-  \\\${unregisterExtension} \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
-  DeleteRegKey HKCR \\\"LMMS Project\\\"
-  DeleteRegKey HKCR \\\"LMMS Project (compressed)\\\"
-  ")
+	SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/nsis_branding.bmp")
+	SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/data/lmms.ico")
+	SET(CPACK_NSIS_INSTALLED_ICON_NAME "lmms.exe")
+	SET(CPACK_NSIS_DISPLAY_NAME "LMMS ${VERSION}")
+	SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lmms.io")
+	SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lmms.io")
+	SET(CPACK_NSIS_CONTACT "lmms-devel@lists.sourceforge.net")
+	SET(CPACK_PACKAGE_EXECUTABLES "lmms.exe;LMMS")
+	SET(CPACK_NSIS_MENU_LINKS "lmms.exe;LMMS")
+	SET(CPACK_NSIS_DEFINES "!include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh")
+	SET(CPACK_PACKAGE_FILE_NAME "lmms-${VERSION}-win32")
+	SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+	  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmp\\\" \\\"LMMS Project\\\"
+	  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
+	  ")
+	SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
+	  \\\${unregisterExtension} \\\".mmp\\\" \\\"LMMS Project\\\"
+	  \\\${unregisterExtension} \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
+	  DeleteRegKey HKCR \\\"LMMS Project\\\"
+	  DeleteRegKey HKCR \\\"LMMS Project (compressed)\\\"
+	  ")
 ELSE(WIN32)
-SET(CPACK_STRIP_FILES "bin/lmms;${PLUGIN_DIR}/*.so")
-SET(CPACK_PACKAGE_EXECUTABLES "lmms" "LMMS binary")
+	SET(CPACK_STRIP_FILES "bin/lmms;${PLUGIN_DIR}/*.so")
+	SET(CPACK_PACKAGE_EXECUTABLES "lmms" "LMMS binary")
 ENDIF(WIN32)
 
 IF(WIN64)
diff --git a/include/caption_menu.h b/include/caption_menu.h
index e8141e739..92b7d7695 100644
--- a/include/caption_menu.h
+++ b/include/caption_menu.h
@@ -30,7 +30,9 @@
 
 #include "export.h"
 
-
+///
+/// \brief A context menu with a caption
+///
 class EXPORT captionMenu : public QMenu
 {
 	Q_OBJECT