diff --git a/glm/core/_swizzle.hpp b/glm/core/_swizzle.hpp
index 5e9d24a7..91652eb0 100644
--- a/glm/core/_swizzle.hpp
+++ b/glm/core/_swizzle.hpp
@@ -53,7 +53,7 @@ namespace glm
 namespace glm{
 namespace detail
 {
-    //! Internal class for implementing swizzle operators
+    // Internal class for implementing swizzle operators
     template <typename T, int N>
     struct _swizzle_base0
     {
@@ -92,7 +92,7 @@ namespace detail
         V operator ()()  const { return V(this->elem(E0), this->elem(E1), this->elem(E2), this->elem(E3)); }
     };
 
-    //! Internal class for implementing swizzle operators
+    // Internal class for implementing swizzle operators
     /*!
         Template parameters:
 
@@ -183,7 +183,7 @@ namespace detail
 		}
     };
 
-	//! Specialization for swizzles containing duplicate elements.  These cannot be modified.
+	// Specialization for swizzles containing duplicate elements.  These cannot be modified.
 	template <typename ValueType, typename VecType, int N, int E0, int E1, int E2, int E3>
 	struct _swizzle_base2<ValueType,VecType,N,E0,E1,E2,E3,1> : public _swizzle_base1<ValueType,VecType,E0,E1,E2,E3,N>
 	{
diff --git a/glm/core/type_mat2x2.hpp b/glm/core/type_mat2x2.hpp
index 5c1d4c3c..0f0c9669 100644
--- a/glm/core/type_mat2x2.hpp
+++ b/glm/core/type_mat2x2.hpp
@@ -48,34 +48,34 @@ namespace detail
 	template <typename T> struct tmat4x3;
 	template <typename T> struct tmat4x4;
 
-	//! \brief Template for 2 * 2 matrix of floating-point numbers.
-	//! \ingroup core_template
+	// @brief Template for 2 * 2 matrix of floating-point numbers.
+	// @ingroup core_template
 	template <typename T> 
 	struct tmat2x2
 	{
+                // Implementation detail
 		enum ctor{null};
 		typedef T value_type;
 		typedef std::size_t size_type;
 		typedef tvec2<T> col_type;
 		typedef tvec2<T> row_type;
-		GLM_FUNC_DECL size_type length() const;
 		static GLM_FUNC_DECL size_type col_size();
 		static GLM_FUNC_DECL size_type row_size();
 
 		typedef tmat2x2<T> type;
 		typedef tmat2x2<T> transpose_type;
-
+        
+		GLM_FUNC_DECL size_type length() const;
+        
 	public:
-		/// Implementation detail
-        /// @cond DETAIL
+                // Implementation detail
 		GLM_FUNC_DECL tmat2x2<T> _inverse() const;
-        /// @endcond
 
 	private:
 		//////////////////////////////////////
-		// Data 
+                // Implementation detail
 		col_type value[2];
-
+        
 	public:
 		//////////////////////////////////////
 		// Constructors
diff --git a/glm/core/type_mat2x3.hpp b/glm/core/type_mat2x3.hpp
index c76e2786..e69828b6 100644
--- a/glm/core/type_mat2x3.hpp
+++ b/glm/core/type_mat2x3.hpp
@@ -48,8 +48,8 @@ namespace detail
 	template <typename T> struct tmat4x3;
 	template <typename T> struct tmat4x4;
 
-	//! \brief Template for 2 columns and 3 rows matrix of floating-point numbers.
-	//! \ingroup core_template
+	// \brief Template for 2 columns and 3 rows matrix of floating-point numbers.
+	// \ingroup core_template
 	template <typename T> 
 	struct tmat2x3
 	{
diff --git a/glm/core/type_mat2x4.hpp b/glm/core/type_mat2x4.hpp
index 8003d469..7740a3d3 100644
--- a/glm/core/type_mat2x4.hpp
+++ b/glm/core/type_mat2x4.hpp
@@ -48,8 +48,8 @@ namespace detail
 	template <typename T> struct tmat4x3;
 	template <typename T> struct tmat4x4;
 
-	//! Template for 2 columns and 4 rows matrix of floating-point numbers.
-	//! \ingroup core_template
+	// Template for 2 columns and 4 rows matrix of floating-point numbers.
+	// \ingroup core_template
 	template <typename T> 
 	struct tmat2x4
 	{
diff --git a/glm/core/type_mat3x2.hpp b/glm/core/type_mat3x2.hpp
index 6aee1966..2e9a0823 100644
--- a/glm/core/type_mat3x2.hpp
+++ b/glm/core/type_mat3x2.hpp
@@ -48,8 +48,8 @@ namespace detail
 	template <typename T> struct tmat4x3;
 	template <typename T> struct tmat4x4;
 
-	//! \brief Template for 3 columns and 2 rows matrix of floating-point numbers.
-	//! \ingroup core_template
+	// \brief Template for 3 columns and 2 rows matrix of floating-point numbers.
+	// \ingroup core_template
 	template <typename T> 
 	struct tmat3x2
 	{
diff --git a/glm/core/type_mat3x3.hpp b/glm/core/type_mat3x3.hpp
index e31ab27f..a4cbd95e 100644
--- a/glm/core/type_mat3x3.hpp
+++ b/glm/core/type_mat3x3.hpp
@@ -48,8 +48,8 @@ namespace detail
 	template <typename T> struct tmat4x3;
 	template <typename T> struct tmat4x4;
 
-	//! @brief Template for 3 * 3 matrix of floating-point numbers.
-	//! @ingroup core_template
+	// @brief Template for 3 * 3 matrix of floating-point numbers.
+	// @ingroup core_template
 	template <typename T> 
 	struct tmat3x3
 	{
diff --git a/glm/core/type_mat3x4.hpp b/glm/core/type_mat3x4.hpp
index fd1ffa2a..34cf48a6 100644
--- a/glm/core/type_mat3x4.hpp
+++ b/glm/core/type_mat3x4.hpp
@@ -48,8 +48,8 @@ namespace detail
 	template <typename T> struct tmat4x3;
 	template <typename T> struct tmat4x4;
 
-	//! \brief Template for 3 columns and 4 rows matrix of floating-point numbers.
-	//! \ingroup core_template
+	// \brief Template for 3 columns and 4 rows matrix of floating-point numbers.
+	// \ingroup core_template
 	template <typename T> 
 	struct tmat3x4
 	{
diff --git a/glm/core/type_mat4x2.hpp b/glm/core/type_mat4x2.hpp
index 96905f7a..d6a264d3 100644
--- a/glm/core/type_mat4x2.hpp
+++ b/glm/core/type_mat4x2.hpp
@@ -48,8 +48,8 @@ namespace detail
 	template <typename T> struct tmat4x3;
 	template <typename T> struct tmat4x4;
 
-	//! \brief Template for 4 columns and 2 rows matrix of floating-point numbers.
-	//! \ingroup core_template
+	// \brief Template for 4 columns and 2 rows matrix of floating-point numbers.
+	// \ingroup core_template
 	template <typename T> 
 	struct tmat4x2
 	{
diff --git a/glm/core/type_mat4x3.hpp b/glm/core/type_mat4x3.hpp
index 345bd3d8..aaf8f1cd 100644
--- a/glm/core/type_mat4x3.hpp
+++ b/glm/core/type_mat4x3.hpp
@@ -48,8 +48,8 @@ namespace detail
 	template <typename T> struct tmat4x3;
 	template <typename T> struct tmat4x4;
 
-	//! \brief Template for 4 columns and 3 rows matrix of floating-point numbers.
-	//! \ingroup core_template
+	// \brief Template for 4 columns and 3 rows matrix of floating-point numbers.
+	// \ingroup core_template
 	template <typename T> 
 	struct tmat4x3
 	{
diff --git a/glm/core/type_mat4x4.hpp b/glm/core/type_mat4x4.hpp
index df0392c8..5599a206 100644
--- a/glm/core/type_mat4x4.hpp
+++ b/glm/core/type_mat4x4.hpp
@@ -48,8 +48,8 @@ namespace detail
 	template <typename T> struct tmat4x3;
 	template <typename T> struct tmat4x4;
 
-	//! \brief Template for 4 * 4 matrix of floating-point numbers.
-	//! \ingroup core_template
+	// \brief Template for 4 * 4 matrix of floating-point numbers.
+	// \ingroup core_template
 	template <typename T> 
 	struct tmat4x4
 	{
diff --git a/glm/core/type_vec2.hpp b/glm/core/type_vec2.hpp
index e9020ef6..0fb128c9 100644
--- a/glm/core/type_vec2.hpp
+++ b/glm/core/type_vec2.hpp
@@ -44,8 +44,8 @@ namespace detail
 	template <typename T> struct tvec3;
 	template <typename T> struct tvec4;
 
-	//! The basic 2D vector type.
-	//! \ingroup core_template
+	// The basic 2D vector type.
+	// \ingroup core_template
 	template <typename T>
 	struct tvec2
 	{
diff --git a/glm/core/type_vec3.hpp b/glm/core/type_vec3.hpp
index 7a542c9d..0077cd09 100644
--- a/glm/core/type_vec3.hpp
+++ b/glm/core/type_vec3.hpp
@@ -44,8 +44,8 @@ namespace detail
 	template <typename T> struct tvec2;
 	template <typename T> struct tvec4;
 
-	//! Basic 3D vector type.
-	//! \ingroup core_template
+	// Basic 3D vector type.
+	// \ingroup core_template
 	template <typename T>
 	struct tvec3
 	{	
diff --git a/glm/core/type_vec4.hpp b/glm/core/type_vec4.hpp
index 424a178a..d481a79c 100644
--- a/glm/core/type_vec4.hpp
+++ b/glm/core/type_vec4.hpp
@@ -44,8 +44,8 @@ namespace detail
 	template <typename T> struct tvec2;
 	template <typename T> struct tvec3;
 
-	/// Basic 4D vector type.
-	/// @ingroup core_template
+	// Basic 4D vector type.
+	// @ingroup core_template
 	template <typename T>
 	struct tvec4
 	{