diff --git a/Source/OpenTK/Audio/OpenAL/AL/AL.cs b/Source/OpenTK/Audio/OpenAL/AL/AL.cs
index d9febaca..91ef0c42 100644
--- a/Source/OpenTK/Audio/OpenAL/AL/AL.cs
+++ b/Source/OpenTK/Audio/OpenAL/AL/AL.cs
@@ -416,14 +416,13 @@ namespace OpenTK.OpenAL
             uint[] temp = new uint[n];
             GenSources( n, out temp[0] );
             sources = new int[n];
-            for ( int i = 0; i < n; i++ )
+            for ( int i = 0 ; i < n ; i++ )
             {
                 sources[i] = (int) temp[i];
             }
         }
 
         /// <summary>This function generates one or more sources. References to sources are int values, which are used wherever a source reference is needed (in calls such as AL.DeleteSources and AL.Source with parameter ALSourcei).</summary>
-        /// <param name="n">The number of sources to be generated.</param>
         /// <param name="sources">Pointer to an array of int values which will store the names of the new sources.</param>
         [CLSCompliant( true )]
         public static void GenSources( int[] sources )
@@ -436,6 +435,23 @@ namespace OpenTK.OpenAL
             }
         }
 
+        /// <summary>This function generates one or more sources. References to sources are int values, which are used wherever a source reference is needed (in calls such as AL.DeleteSources and AL.Source with parameter ALSourcei).</summary>
+        /// <param name="n">The number of sources to be generated.</param>
+        /// <returns>Pointer to an array of int values which will store the names of the new sources.</returns>
+        [CLSCompliant( true )]
+        public static int[] GenSources( int n )
+        {
+            uint[] temp = new uint[n];
+            GenSources( temp.Length, out temp[0] );
+            int[] sources = new int[n];
+            for ( int i = 0 ; i < temp.Length ; i++ )
+            {
+                sources[i] = (int) temp[i];
+            }
+            return sources;
+        }
+
+
         /// <summary>This function generates one source only. References to sources are uint values, which are used wherever a source reference is needed (in calls such as AL.DeleteSources and AL.Source with parameter ALSourcei).</summary>
         /// <param name="source">Pointer to an uint value which will store the name of the new source.</param>
         [CLSCompliant( false )]
@@ -455,7 +471,7 @@ namespace OpenTK.OpenAL
         }
 
         /// <summary>This function generates one source only. References to sources are int values, which are used wherever a source reference is needed (in calls such as AL.DeleteSources and AL.Source with parameter ALSourcei).</summary>
-        /// <param name="source">Pointer to an int value which will store the name of the new source.</param>
+        /// <returns>Pointer to an int value which will store the name of the new source.</returns>
         [CLSCompliant( true )]
         public static int GenSources( )
         {
@@ -494,7 +510,7 @@ namespace OpenTK.OpenAL
         public static void DeleteSources( int n, ref int[] sources )
         {
             uint[] temp = new uint[n];
-            for ( int i = 0; i < n; i++ )
+            for ( int i = 0 ; i < n ; i++ )
             {
                 temp[i] = (uint) sources[i];
             }
@@ -502,7 +518,6 @@ namespace OpenTK.OpenAL
         }
 
         /// <summary>This function deletes one or more sources.</summary>
-        /// <param name="n">The number of sources to be deleted.</param>
         /// <param name="sources">Pointer to an array of source names identifying the sources to be deleted.</param>
         [CLSCompliant( true )]
         public static void DeleteSources( int[] sources )
@@ -893,7 +908,7 @@ namespace OpenTK.OpenAL
         public static void SourcePlay( int ns, int[] sids )
         {
             uint[] temp = new uint[ns];
-            for ( int i = 0; i < ns; i++ )
+            for ( int i = 0 ; i < ns ; i++ )
             {
                 temp[i] = (uint) sids[i];
             }
@@ -948,7 +963,7 @@ namespace OpenTK.OpenAL
         public static void SourceStop( int ns, int[] sids )
         {
             uint[] temp = new uint[ns];
-            for ( int i = 0; i < ns; i++ )
+            for ( int i = 0 ; i < ns ; i++ )
             {
                 temp[i] = (uint) sids[i];
             }
@@ -1003,7 +1018,7 @@ namespace OpenTK.OpenAL
         public static void SourceRewind( int ns, int[] sids )
         {
             uint[] temp = new uint[ns];
-            for ( int i = 0; i < ns; i++ )
+            for ( int i = 0 ; i < ns ; i++ )
             {
                 temp[i] = (uint) sids[i];
             }
@@ -1057,7 +1072,7 @@ namespace OpenTK.OpenAL
         public static void SourcePause( int ns, int[] sids )
         {
             uint[] temp = new uint[ns];
-            for ( int i = 0; i < ns; i++ )
+            for ( int i = 0 ; i < ns ; i++ )
             {
                 temp[i] = (uint) sids[i];
             }
@@ -1195,7 +1210,7 @@ namespace OpenTK.OpenAL
         public static void SourceQueueBuffers( int sid, int numEntries, int[] bids )
         {
             uint[] temp = new uint[numEntries];
-            for ( int i = 0; i < numEntries; i++ )
+            for ( int i = 0 ; i < numEntries ; i++ )
             {
                 temp[i] = (uint) bids[i];
             }
@@ -1254,7 +1269,7 @@ namespace OpenTK.OpenAL
         public static void SourceUnqueueBuffers( int sid, int numEntries, int[] bids )
         {
             uint[] temp = new uint[numEntries];
-            for ( int i = 0; i < numEntries; i++ )
+            for ( int i = 0 ; i < numEntries ; i++ )
             {
                 temp[i] = (uint) bids[i];
             }
@@ -1331,7 +1346,20 @@ namespace OpenTK.OpenAL
             uint[] temp = new uint[n];
             GenBuffers( n, out temp[0] );
             buffers = new int[n];
-            for ( int i = 0; i < n; i++ )
+            for ( int i = 0 ; i < n ; i++ )
+            {
+                buffers[i] = (int) temp[i];
+            }
+        }
+
+        /// <summary>This function generates one or more buffers, which contain audio data (see AL.BufferData). References to buffers are uint values, which are used wherever a buffer reference is needed (in calls such as AL.DeleteBuffers, AL.Source with parameter ALSourcei, AL.SourceQueueBuffers, and AL.SourceUnqueueBuffers).</summary>
+        /// <param name="buffers">Pointer to an array of uint values which will store the names of the new buffers.</param>
+        [CLSCompliant( true )]
+        public static void GenBuffers( int[] buffers )
+        {
+            uint[] temp = new uint[buffers.Length];
+            GenBuffers( temp.Length, out temp[0] );
+            for ( int i = 0 ; i < temp.Length ; i++ )
             {
                 buffers[i] = (int) temp[i];
             }
@@ -1339,16 +1367,18 @@ namespace OpenTK.OpenAL
 
         /// <summary>This function generates one or more buffers, which contain audio data (see AL.BufferData). References to buffers are uint values, which are used wherever a buffer reference is needed (in calls such as AL.DeleteBuffers, AL.Source with parameter ALSourcei, AL.SourceQueueBuffers, and AL.SourceUnqueueBuffers).</summary>
         /// <param name="n">The number of buffers to be generated.</param>
-        /// <param name="buffers">Pointer to an array of uint values which will store the names of the new buffers.</param>
+        /// <returns>Pointer to an array of uint values which will store the names of the new buffers.</returns>
         [CLSCompliant( true )]
-        public static void GenBuffers( int[] buffers )
+        public static int[] GenBuffers( int n )
         {
-            uint[] temp = new uint[buffers.Length];
+            uint[] temp = new uint[n];
             GenBuffers( temp.Length, out temp[0] );
-            for ( int i = 0 ; i <temp.Length ; i++ )
+            int[] buffers = new int[n];
+            for ( int i = 0 ; i < temp.Length ; i++ )
             {
                 buffers[i] = (int) temp[i];
             }
+            return buffers;
         }
 
         /// <summary>This function generates one buffer only, which contain audio data (see AL.BufferData). References to buffers are uint values, which are used wherever a buffer reference is needed (in calls such as AL.DeleteBuffers, AL.Source with parameter ALSourcei, AL.SourceQueueBuffers, and AL.SourceUnqueueBuffers).</summary>
@@ -1370,7 +1400,7 @@ namespace OpenTK.OpenAL
         }
 
         /// <summary>This function generates one buffer only, which contain audio data (see AL.BufferData). References to buffers are uint values, which are used wherever a buffer reference is needed (in calls such as AL.DeleteBuffers, AL.Source with parameter ALSourcei, AL.SourceQueueBuffers, and AL.SourceUnqueueBuffers).</summary>
-        /// <param name="buffer">Pointer to an uint value which will store the name of the new buffer.</param>
+        /// <returns>Pointer to an uint value which will store the name of the new buffer.</returns>
         [CLSCompliant( true )]
         public static int GenBuffers( )
         {
@@ -1412,7 +1442,7 @@ namespace OpenTK.OpenAL
         public static void DeleteBuffers( int n, ref int[] buffers )
         {
             uint[] temp = new uint[n];
-            for ( int i = 0; i < n; i++ )
+            for ( int i = 0 ; i < n ; i++ )
             {
                 temp[i] = (uint) buffers[i];
             }
diff --git a/Source/OpenTK/Audio/OpenAL/AL/Efx.cs b/Source/OpenTK/Audio/OpenAL/AL/Efx.cs
index e25598b5..55d9b79d 100644
--- a/Source/OpenTK/Audio/OpenAL/AL/Efx.cs
+++ b/Source/OpenTK/Audio/OpenAL/AL/Efx.cs
@@ -25,10 +25,10 @@ namespace OpenTK.OpenAL
         /// <summary>(Helper) Selects the Effect type used by this Effect handle.</summary>
         /// <param name="eid">Effect id returned from a successful call to GenEffects.</param>
         /// <param name="type">Effect type.</param>
-        [CLSCompliant(false)]
-        public void BindEffect( uint eid,Enums.EfxEffectType type )
+        [CLSCompliant( false )]
+        public void BindEffect( uint eid, Enums.EfxEffectType type )
         {
-            Imported_alEffecti(eid,Enums.EfxEffecti.EffectType,(int) type);
+            Imported_alEffecti( eid, Enums.EfxEffecti.EffectType, (int) type );
         }
 
         /// <summary>(Helper) Selects the Effect type used by this Effect handle.</summary>
@@ -37,7 +37,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void BindEffect( int eid, Enums.EfxEffectType type )
         {
-            Imported_alEffecti( (uint)eid, Enums.EfxEffecti.EffectType, (int) type );
+            Imported_alEffecti( (uint) eid, Enums.EfxEffecti.EffectType, (int) type );
         }
 
         #endregion BindEffect
@@ -47,10 +47,10 @@ namespace OpenTK.OpenAL
         /// <summary>(Helper) reroutes the output of a Source through a Filter.</summary>
         /// <param name="source">A valid Source handle.</param>
         /// <param name="filter">A valid Filter handle.</param>
-        [CLSCompliant(false)]
-        public void BindFilterToSource( uint source,uint filter )
+        [CLSCompliant( false )]
+        public void BindFilterToSource( uint source, uint filter )
         {
-            AL.Source(source,Enums.ALSourcei.EfxDirectFilter,(int) filter);
+            AL.Source( source, Enums.ALSourcei.EfxDirectFilter, (int) filter );
         }
 
         /// <summary>(Helper) reroutes the output of a Source through a Filter.</summary>
@@ -59,7 +59,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void BindFilterToSource( int source, int filter )
         {
-            AL.Source( (uint)source, Enums.ALSourcei.EfxDirectFilter, (int) filter );
+            AL.Source( (uint) source, Enums.ALSourcei.EfxDirectFilter, (int) filter );
         }
 
         #endregion BindFilterToSource
@@ -69,10 +69,10 @@ namespace OpenTK.OpenAL
         /// <summary>(Helper) Attaches an Effect to an Auxiliary Effect Slot.</summary>
         /// <param name="auxiliaryeffectslot">The slot handle to attach the Effect to.</param>
         /// <param name="effect">The Effect handle that is being attached.</param>
-        [CLSCompliant(false)]
-        public void BindEffectToAuxiliarySlot( uint auxiliaryeffectslot,uint effect )
+        [CLSCompliant( false )]
+        public void BindEffectToAuxiliarySlot( uint auxiliaryeffectslot, uint effect )
         {
-            AuxiliaryEffectSlot(auxiliaryeffectslot,Enums.EfxAuxiliaryi.EffectslotEffect,(int) effect);
+            AuxiliaryEffectSlot( auxiliaryeffectslot, Enums.EfxAuxiliaryi.EffectslotEffect, (int) effect );
         }
 
         /// <summary>(Helper) Attaches an Effect to an Auxiliary Effect Slot.</summary>
@@ -81,7 +81,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void BindEffectToAuxiliarySlot( int auxiliaryeffectslot, int effect )
         {
-            AuxiliaryEffectSlot( (uint)auxiliaryeffectslot, Enums.EfxAuxiliaryi.EffectslotEffect, (int) effect );
+            AuxiliaryEffectSlot( (uint) auxiliaryeffectslot, Enums.EfxAuxiliaryi.EffectslotEffect, (int) effect );
         }
 
         #endregion BindEffectToAuxiliarySlot
@@ -93,8 +93,8 @@ namespace OpenTK.OpenAL
         /// <param name="slot">The Auxiliary Effect Slot handle that receives input from the Source.</param>
         /// <param name="slotnumber">Every Source has only a limited number of slots it can feed data to. The number must stay below AlcContextAttributes.EfxMaxAuxiliarySends</param>
         /// <param name="filter">Filter handle to be attached between Source ouput and Auxiliary Slot input. Use 0 or EfxFilterType.FilterNull for no filter. </param>
-        [CLSCompliant(false)]
-        public void BindSourceToAuxiliarySlot( uint source,uint slot,int slotnumber,uint filter )
+        [CLSCompliant( false )]
+        public void BindSourceToAuxiliarySlot( uint source, uint slot, int slotnumber, uint filter )
         {
             AL.Source( source, Enums.ALSource3i.EfxAuxiliarySendFilter, (int) slot, (int) slotnumber, (int) filter );
         }
@@ -107,7 +107,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void BindSourceToAuxiliarySlot( int source, int slot, int slotnumber, int filter )
         {
-            AL.Source( (uint)source, Enums.ALSource3i.EfxAuxiliarySendFilter, (int) slot,(int) slotnumber, (int) filter );
+            AL.Source( (uint) source, Enums.ALSource3i.EfxAuxiliarySendFilter, (int) slot, (int) slotnumber, (int) filter );
         }
 
         #endregion BindSourceToAuxiliarySlot
@@ -119,7 +119,7 @@ namespace OpenTK.OpenAL
         #region alGenEffects
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alGenEffects( int n,[Out] uint* effects );
+        unsafe private delegate void Delegate_alGenEffects( int n, [Out] uint* effects );
         // typedef void (__cdecl *LPALGENEFFECTS)( ALsizei n, ALuint* effects );
 
         //[CLSCompliant(false)]
@@ -129,14 +129,14 @@ namespace OpenTK.OpenAL
         /// <remarks>After creation an Effect has no type (EfxEffectType.Null), so before it can be used to store a set of parameters, the application must specify what type of effect should be stored in the object, using Effect() with EfxEffecti.</remarks>
         /// <param name="n">Number of Effects to be created.</param>
         /// <param name="effects">Pointer addressing sufficient memory to store n Effect object identifiers.</param>
-        [CLSCompliant(false)]
-        public void GenEffects( int n,out uint effects )
+        [CLSCompliant( false )]
+        public void GenEffects( int n, out uint effects )
         {
             unsafe
             {
                 fixed ( uint* ptr = &effects )
                 {
-                    Imported_alGenEffects(n,ptr);
+                    Imported_alGenEffects( n, ptr );
                     effects = *ptr;
                 }
             }
@@ -152,7 +152,7 @@ namespace OpenTK.OpenAL
             uint[] temp = new uint[n];
             GenEffects( n, out temp[0] );
             effects = new int[n];
-            for ( int i = 0; i < n; i++ )
+            for ( int i = 0 ; i < n ; i++ )
             {
                 effects[i] = (int) temp[i];
             }
@@ -160,7 +160,6 @@ namespace OpenTK.OpenAL
 
         /// <summary>The GenEffects function is used to create one or more Effect objects. An Effect object stores an effect type and a set of parameter values to control that Effect. In order to use an Effect it must be attached to an Auxiliary Effect Slot object</summary>
         /// <remarks>After creation an Effect has no type (EfxEffectType.Null), so before it can be used to store a set of parameters, the application must specify what type of effect should be stored in the object, using Effect() with EfxEffecti.</remarks>
-        /// <param name="n">Number of Effects to be created.</param>
         /// <param name="effects">Pointer addressing sufficient memory to store n Effect object identifiers.</param>
         [CLSCompliant( true )]
         public void GenEffects( int[] effects )
@@ -173,6 +172,23 @@ namespace OpenTK.OpenAL
             }
         }
 
+        /// <summary>The GenEffects function is used to create one or more Effect objects. An Effect object stores an effect type and a set of parameter values to control that Effect. In order to use an Effect it must be attached to an Auxiliary Effect Slot object</summary>
+        /// <remarks>After creation an Effect has no type (EfxEffectType.Null), so before it can be used to store a set of parameters, the application must specify what type of effect should be stored in the object, using Effect() with EfxEffecti.</remarks>
+        /// <param name="n">Number of Effects to be created.</param>
+        /// <returns>Pointer addressing sufficient memory to store n Effect object identifiers.</returns>
+        [CLSCompliant( true )]
+        public int[] GenEffects( int n )
+        {
+            uint[] temp = new uint[n];
+            GenEffects( temp.Length, out temp[0] );
+            int[] effects = new int[n];
+            for ( int i = 0 ; i < temp.Length ; i++ )
+            {
+                effects[i] = (int) temp[i];
+            }
+            return effects;
+        }
+
         /// <summary>This function generates only one Effect.</summary>
         /// <param name="effect">Storage UInt32 for the new effect name/handle.</param>
         [CLSCompliant( false )]
@@ -182,7 +198,7 @@ namespace OpenTK.OpenAL
             {
                 fixed ( uint* ptr = &effect )
                 {
-                    Imported_alGenEffects(1,ptr);
+                    Imported_alGenEffects( 1, ptr );
                 }
             }
         }
@@ -198,9 +214,9 @@ namespace OpenTK.OpenAL
         }
 
         /// <summary>This function generates only one Effect.</summary>
-        /// <param name="effect">Storage UInt32 for the new effect name/handle.</param>
+        /// <returns>Storage UInt32 for the new effect name/handle.</returns>
         [CLSCompliant( true )]
-        public int GenEffects(  )
+        public int GenEffects( )
         {
             uint temp;
             GenEffects( out temp );
@@ -212,7 +228,7 @@ namespace OpenTK.OpenAL
         #region alDeleteEffects
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alDeleteEffects( int n,[In] uint* effects );
+        unsafe private delegate void Delegate_alDeleteEffects( int n, [In] uint* effects );
         // typedef void (__cdecl *LPALDELETEEFFECTS)( ALsizei n, ALuint* effects );
 
         //[CLSCompliant(false)]
@@ -221,26 +237,26 @@ namespace OpenTK.OpenAL
         /// <summary>The DeleteEffects function is used to delete and free resources for Effect objects previously created with GenEffects.</summary>
         /// <param name="n">Number of Effects to be deleted.</param>
         /// <param name="effects">Pointer to n Effect object identifiers.</param>
-        [CLSCompliant(false)]
-        public void DeleteEffects( int n,ref uint[] effects )
+        [CLSCompliant( false )]
+        public void DeleteEffects( int n, ref uint[] effects )
         {
             unsafe
             {
                 fixed ( uint* ptr = effects )
                 {
-                    Imported_alDeleteEffects(n,ptr);
+                    Imported_alDeleteEffects( n, ptr );
                 }
             }
         }
 
-         /// <summary>The DeleteEffects function is used to delete and free resources for Effect objects previously created with GenEffects.</summary>
+        /// <summary>The DeleteEffects function is used to delete and free resources for Effect objects previously created with GenEffects.</summary>
         /// <param name="n">Number of Effects to be deleted.</param>
         /// <param name="effects">Pointer to n Effect object identifiers.</param>
         [CLSCompliant( true )]
         public void DeleteEffects( int n, ref int[] effects )
         {
             uint[] temp = new uint[n];
-            for ( int i = 0; i < n; i++ )
+            for ( int i = 0 ; i < n ; i++ )
             {
                 temp[i] = (uint) effects[i];
             }
@@ -248,7 +264,6 @@ namespace OpenTK.OpenAL
         }
 
         /// <summary>The DeleteEffects function is used to delete and free resources for Effect objects previously created with GenEffects.</summary>
-        /// <param name="n">Number of Effects to be deleted.</param>
         /// <param name="effects">Pointer to n Effect object identifiers.</param>
         [CLSCompliant( true )]
         public void DeleteEffects( int[] effects )
@@ -263,21 +278,21 @@ namespace OpenTK.OpenAL
 
         /// <summary>This function deletes one Effect only.</summary>
         /// <param name="effect">Pointer to an effect name/handle identifying the Effect Object to be deleted.</param>
-        [CLSCompliant(false)]
+        [CLSCompliant( false )]
         public void DeleteEffects( ref uint effect )
         {
             unsafe
             {
                 fixed ( uint* ptr = &effect )
                 {
-                    Imported_alDeleteEffects(1,ptr);
+                    Imported_alDeleteEffects( 1, ptr );
                 }
             }
         }
 
-         /// <summary>This function deletes one Effect only.</summary>
+        /// <summary>This function deletes one Effect only.</summary>
         /// <param name="effect">Pointer to an effect name/handle identifying the Effect Object to be deleted.</param>
-        [CLSCompliant( true)]
+        [CLSCompliant( true )]
         public void DeleteEffects( ref int effect )
         {
             uint temp = (uint) effect;
@@ -307,13 +322,13 @@ namespace OpenTK.OpenAL
         /// <summary>The IsEffect function is used to determine if an object identifier is a valid Effect object.</summary>
         /// <param name="eid">Effect identifier to validate.</param>
         /// <returns>True if the identifier is a valid Effect, False otherwise.</returns>
-        [CLSCompliant(false)]
+        [CLSCompliant( false )]
         public bool IsEffect( uint eid )
         {
-            return Imported_alIsEffect(eid);
+            return Imported_alIsEffect( eid );
         }
 
-         /// <summary>The IsEffect function is used to determine if an object identifier is a valid Effect object.</summary>
+        /// <summary>The IsEffect function is used to determine if an object identifier is a valid Effect object.</summary>
         /// <param name="eid">Effect identifier to validate.</param>
         /// <returns>True if the identifier is a valid Effect, False otherwise.</returns>
         [CLSCompliant( true )]
@@ -327,7 +342,7 @@ namespace OpenTK.OpenAL
         #region alEffecti
 
         //[CLSCompliant(false)]
-        private delegate void Delegate_alEffecti( uint eid,Enums.EfxEffecti param,int value );
+        private delegate void Delegate_alEffecti( uint eid, Enums.EfxEffecti param, int value );
         // typedef void (__cdecl *LPALEFFECTI)( ALuint eid, ALenum param, ALint value); 
 
         //[CLSCompliant(false)]
@@ -337,10 +352,10 @@ namespace OpenTK.OpenAL
         /// <param name="eid">Effect object identifier.</param>
         /// <param name="param">Effect property to set.</param>
         /// <param name="value">Integer value.</param>
-        [CLSCompliant(false)]
-        public void Effect( uint eid,Enums.EfxEffecti param,int value )
+        [CLSCompliant( false )]
+        public void Effect( uint eid, Enums.EfxEffecti param, int value )
         {
-            Imported_alEffecti(eid,param,value);
+            Imported_alEffecti( eid, param, value );
         }
 
         /// <summary>This function is used to set integer properties on Effect objects.</summary>
@@ -350,7 +365,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void Effect( int eid, Enums.EfxEffecti param, int value )
         {
-            Imported_alEffecti( (uint)eid, param, value );
+            Imported_alEffecti( (uint) eid, param, value );
         }
 
         #endregion alEffecti
@@ -358,7 +373,7 @@ namespace OpenTK.OpenAL
         #region alEffectf
 
         //[CLSCompliant(false)]
-        private delegate void Delegate_alEffectf( uint eid,Enums.EfxEffectf param,float value );
+        private delegate void Delegate_alEffectf( uint eid, Enums.EfxEffectf param, float value );
         // typedef void (__cdecl *LPALEFFECTF)( ALuint eid, ALenum param, ALfloat value);
 
         //[CLSCompliant(false)]
@@ -368,10 +383,10 @@ namespace OpenTK.OpenAL
         /// <param name="eid">Effect object identifier.</param>
         /// <param name="param">Effect property to set.</param>
         /// <param name="value">Floating point value.</param>
-        [CLSCompliant(false)]
-        public void Effect( uint eid,Enums.EfxEffectf param,float value )
+        [CLSCompliant( false )]
+        public void Effect( uint eid, Enums.EfxEffectf param, float value )
         {
-            Imported_alEffectf(eid,param,value);
+            Imported_alEffectf( eid, param, value );
         }
 
         /// <summary>This function is used to set floating point properties on Effect objects.</summary>
@@ -381,7 +396,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void Effect( int eid, Enums.EfxEffectf param, float value )
         {
-            Imported_alEffectf((uint) eid, param, value );
+            Imported_alEffectf( (uint) eid, param, value );
         }
 
         #endregion alEffectf
@@ -389,7 +404,7 @@ namespace OpenTK.OpenAL
         #region alEffectfv
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alEffectfv( uint eid,Enums.EfxEffect3f param,[In] float* values );
+        unsafe private delegate void Delegate_alEffectfv( uint eid, Enums.EfxEffect3f param, [In] float* values );
         // typedef void (__cdecl *LPALEFFECTFV)( ALuint eid, ALenum param, ALfloat* values ); 
 
         //[CLSCompliant(false)]
@@ -399,14 +414,14 @@ namespace OpenTK.OpenAL
         /// <param name="eid">Effect object identifier.</param>
         /// <param name="param">Effect property to set.</param>
         /// <param name="values">Pointer to Math.Vector3.</param>
-        [CLSCompliant(false)]
-        public void Effect( uint eid,Enums.EfxEffect3f param,ref Vector3 values )
+        [CLSCompliant( false )]
+        public void Effect( uint eid, Enums.EfxEffect3f param, ref Vector3 values )
         {
             unsafe
             {
                 fixed ( float* ptr = &values.X )
                 {
-                    Imported_alEffectfv(eid,param,ptr);
+                    Imported_alEffectfv( eid, param, ptr );
                 }
             }
         }
@@ -426,7 +441,7 @@ namespace OpenTK.OpenAL
         #region alGetEffecti
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alGetEffecti( uint eid,Enums.EfxEffecti pname,[Out] int* value );
+        unsafe private delegate void Delegate_alGetEffecti( uint eid, Enums.EfxEffecti pname, [Out] int* value );
         // typedef void (__cdecl *LPALGETEFFECTI)( ALuint eid, ALenum pname, ALint* value );
 
         //[CLSCompliant(false)]
@@ -436,14 +451,14 @@ namespace OpenTK.OpenAL
         /// <param name="eid">Effect object identifier.</param>
         /// <param name="pname">Effect property to retrieve.</param>
         /// <param name="value">Address where integer value will be stored.</param>
-        [CLSCompliant(false)]
-        public void GetEffect( uint eid,Enums.EfxEffecti pname,out int value )
+        [CLSCompliant( false )]
+        public void GetEffect( uint eid, Enums.EfxEffecti pname, out int value )
         {
             unsafe
             {
                 fixed ( int* ptr = &value )
                 {
-                    Imported_alGetEffecti(eid,pname,ptr);
+                    Imported_alGetEffecti( eid, pname, ptr );
                 }
             }
         }
@@ -455,7 +470,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void GetEffect( int eid, Enums.EfxEffecti pname, out int value )
         {
-            GetEffect((uint)eid, pname, out value );
+            GetEffect( (uint) eid, pname, out value );
         }
 
         #endregion alGetEffecti
@@ -463,7 +478,7 @@ namespace OpenTK.OpenAL
         #region alGetEffectf
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alGetEffectf( uint eid,Enums.EfxEffectf pname,[Out]float* value );
+        unsafe private delegate void Delegate_alGetEffectf( uint eid, Enums.EfxEffectf pname, [Out]float* value );
         // typedef void (__cdecl *LPALGETEFFECTF)( ALuint eid, ALenum pname, ALfloat* value );
 
         //[CLSCompliant(false)]
@@ -473,14 +488,14 @@ namespace OpenTK.OpenAL
         /// <param name="eid">Effect object identifier.</param>
         /// <param name="pname">Effect property to retrieve.</param>
         /// <param name="value">Address where floating point value will be stored.</param>
-        [CLSCompliant(false)]
-        public void GetEffect( uint eid,Enums.EfxEffectf pname,out float value )
+        [CLSCompliant( false )]
+        public void GetEffect( uint eid, Enums.EfxEffectf pname, out float value )
         {
             unsafe
             {
                 fixed ( float* ptr = &value )
                 {
-                    Imported_alGetEffectf(eid,pname,ptr);
+                    Imported_alGetEffectf( eid, pname, ptr );
                 }
             }
         }
@@ -500,7 +515,7 @@ namespace OpenTK.OpenAL
         #region alGetEffectfv
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alGetEffectfv( uint eid,Enums.EfxEffect3f param,[Out] float* values );
+        unsafe private delegate void Delegate_alGetEffectfv( uint eid, Enums.EfxEffect3f param, [Out] float* values );
         // typedef void (__cdecl *LPALGETEFFECTFV)( ALuint eid, ALenum pname, ALfloat* values );
 
         //[CLSCompliant(false)]
@@ -510,14 +525,14 @@ namespace OpenTK.OpenAL
         /// <param name="eid">Effect object identifier.</param>
         /// <param name="pname">Effect property to retrieve.</param>
         /// <param name="value">A Math.Vector3 to hold the values.</param>
-        [CLSCompliant(false)]
-        public void GetEffect( uint eid,Enums.EfxEffect3f param,out Vector3 values )
+        [CLSCompliant( false )]
+        public void GetEffect( uint eid, Enums.EfxEffect3f param, out Vector3 values )
         {
             unsafe
             {
                 fixed ( float* ptr = &values.X )
                 {
-                    Imported_alGetEffectfv(eid,param,ptr);
+                    Imported_alGetEffectfv( eid, param, ptr );
                     values.X = ptr[0];
                     values.Y = ptr[1];
                     values.Z = ptr[2];
@@ -548,7 +563,7 @@ namespace OpenTK.OpenAL
         #region alGenFilters
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alGenFilters( int n,[Out] uint* filters );
+        unsafe private delegate void Delegate_alGenFilters( int n, [Out] uint* filters );
         // typedef void (__cdecl *LPALGENFILTERS)( ALsizei n, ALuint* filters ); 
 
         //[CLSCompliant(false)]
@@ -558,14 +573,14 @@ namespace OpenTK.OpenAL
         /// <remarks>After creation a Filter has no type (EfxFilterType.Null), so before it can be used to store a set of parameters, the application must specify what type of filter should be stored in the object, using Filter() with EfxFilteri.</remarks>
         /// <param name="n">Number of Filters to be created.</param>
         /// <param name="filters">Pointer addressing sufficient memory to store n Filter object identifiers.</param>
-        [CLSCompliant(false)]
-        public void GenFilters( int n,out uint filters )
+        [CLSCompliant( false )]
+        public void GenFilters( int n, out uint filters )
         {
             unsafe
             {
                 fixed ( uint* ptr = &filters )
                 {
-                    Imported_alGenFilters(n,ptr);
+                    Imported_alGenFilters( n, ptr );
                     filters = *ptr;
                 }
             }
@@ -581,7 +596,7 @@ namespace OpenTK.OpenAL
             uint[] temp = new uint[n];
             GenFilters( n, out temp[0] );
             filters = new int[n];
-            for ( int i = 0; i < n; i++ )
+            for ( int i = 0 ; i < n ; i++ )
             {
                 filters[i] = (int) temp[i];
             }
@@ -589,7 +604,6 @@ namespace OpenTK.OpenAL
 
         /// <summary>The GenFilters function is used to create one or more Filter objects. A Filter object stores a filter type and a set of parameter values to control that Filter. Filter objects can be attached to Sources as Direct Filters or Auxiliary Send Filters.</summary>
         /// <remarks>After creation a Filter has no type (EfxFilterType.Null), so before it can be used to store a set of parameters, the application must specify what type of filter should be stored in the object, using Filter() with EfxFilteri.</remarks>
-        /// <param name="n">Number of Filters to be created.</param>
         /// <param name="filters">Pointer addressing sufficient memory to store n Filter object identifiers.</param>
         [CLSCompliant( true )]
         public void GenFilters( int[] filters )
@@ -602,6 +616,23 @@ namespace OpenTK.OpenAL
             }
         }
 
+        /// <summary>The GenFilters function is used to create one or more Filter objects. A Filter object stores a filter type and a set of parameter values to control that Filter. Filter objects can be attached to Sources as Direct Filters or Auxiliary Send Filters.</summary>
+        /// <remarks>After creation a Filter has no type (EfxFilterType.Null), so before it can be used to store a set of parameters, the application must specify what type of filter should be stored in the object, using Filter() with EfxFilteri.</remarks>
+        /// <param name="n">Number of Filters to be created.</param>
+        /// <returns>Pointer addressing sufficient memory to store n Filter object identifiers.</returns>
+        [CLSCompliant( true )]
+        public int[] GenFilters( int n )
+        {
+            uint[] temp = new uint[n];
+            GenFilters( temp.Length, out temp[0] );
+            int[] filters = new int[n];
+            for ( int i = 0 ; i < temp.Length ; i++ )
+            {
+                filters[i] = (int) temp[i];
+            }
+            return filters;
+        }
+
         /// <summary>This function generates only one Filter.</summary>
         /// <param name="filter">Storage UInt32 for the new filter name/handle.</param>
         [CLSCompliant( false )]
@@ -611,7 +642,7 @@ namespace OpenTK.OpenAL
             {
                 fixed ( uint* ptr = &filter )
                 {
-                    Imported_alGenFilters(1,ptr);
+                    Imported_alGenFilters( 1, ptr );
                 }
             }
         }
@@ -627,7 +658,7 @@ namespace OpenTK.OpenAL
         }
 
         /// <summary>This function generates only one Filter.</summary>
-        /// <param name="filter">Storage UInt32 for the new filter name/handle.</param>
+        /// <returns>Storage UInt32 for the new filter name/handle.</returns>
         [CLSCompliant( true )]
         public int GenFilters( )
         {
@@ -641,7 +672,7 @@ namespace OpenTK.OpenAL
         #region alDeleteFilters
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alDeleteFilters( int n,[In] uint* filters );
+        unsafe private delegate void Delegate_alDeleteFilters( int n, [In] uint* filters );
         // typedef void (__cdecl *LPALDELETEFILTERS)( ALsizei n, ALuint* filters );
 
         //[CLSCompliant(false)]
@@ -650,14 +681,14 @@ namespace OpenTK.OpenAL
         /// <summary>The DeleteFilters function is used to delete and free resources for Filter objects previously created with GenFilters.</summary>
         /// <param name="n">Number of Filters to be deleted.</param>
         /// <param name="filters">Pointer to n Filter object identifiers.</param>
-        [CLSCompliant(false)]
-        public void DeleteFilters( int n,ref uint[] filters )
+        [CLSCompliant( false )]
+        public void DeleteFilters( int n, ref uint[] filters )
         {
             unsafe
             {
                 fixed ( uint* ptr = filters )
                 {
-                    Imported_alDeleteFilters(n,ptr);
+                    Imported_alDeleteFilters( n, ptr );
                 }
             }
         }
@@ -669,7 +700,7 @@ namespace OpenTK.OpenAL
         public void DeleteFilters( int n, ref int[] filters )
         {
             uint[] temp = new uint[n];
-            for ( int i = 0; i < n; i++ )
+            for ( int i = 0 ; i < n ; i++ )
             {
                 temp[i] = (uint) filters[i];
             }
@@ -677,7 +708,6 @@ namespace OpenTK.OpenAL
         }
 
         /// <summary>The DeleteFilters function is used to delete and free resources for Filter objects previously created with GenFilters.</summary>
-        /// <param name="n">Number of Filters to be deleted.</param>
         /// <param name="filters">Pointer to n Filter object identifiers.</param>
         [CLSCompliant( true )]
         public void DeleteFilters( int[] filters )
@@ -692,14 +722,14 @@ namespace OpenTK.OpenAL
 
         /// <summary>This function deletes one Filter only.</summary>
         /// <param name="filter">Pointer to an filter name/handle identifying the Filter Object to be deleted.</param>
-        [CLSCompliant(false)]
+        [CLSCompliant( false )]
         public void DeleteFilters( ref uint filter )
         {
             unsafe
             {
                 fixed ( uint* ptr = &filter )
                 {
-                    Imported_alDeleteFilters(1,ptr);
+                    Imported_alDeleteFilters( 1, ptr );
                 }
             }
         }
@@ -736,10 +766,10 @@ namespace OpenTK.OpenAL
         /// <summary>The IsFilter function is used to determine if an object identifier is a valid Filter object.</summary>
         /// <param name="fid">Effect identifier to validate.</param>
         /// <returns>True if the identifier is a valid Filter, False otherwise.</returns>
-        [CLSCompliant(false)]
+        [CLSCompliant( false )]
         public bool IsFilter( uint fid )
         {
-            return Imported_alIsFilter(fid);
+            return Imported_alIsFilter( fid );
         }
 
         /// <summary>The IsFilter function is used to determine if an object identifier is a valid Filter object.</summary>
@@ -756,7 +786,7 @@ namespace OpenTK.OpenAL
         #region alFilteri
 
         //[CLSCompliant(false)]
-        private delegate void Delegate_alFilteri( uint fid,Enums.EfxFilteri param,int value );
+        private delegate void Delegate_alFilteri( uint fid, Enums.EfxFilteri param, int value );
         // typedef void (__cdecl *LPALFILTERI)( ALuint fid, ALenum param, ALint value );
 
         //[CLSCompliant(false)]
@@ -766,10 +796,10 @@ namespace OpenTK.OpenAL
         /// <param name="fid">Filter object identifier.</param>
         /// <param name="param">Effect property to set.</param>
         /// <param name="value">Integer value.</param>
-        [CLSCompliant(false)]
-        public void Filter( uint fid,Enums.EfxFilteri param,int value )
+        [CLSCompliant( false )]
+        public void Filter( uint fid, Enums.EfxFilteri param, int value )
         {
-            Imported_alFilteri(fid,param,value);
+            Imported_alFilteri( fid, param, value );
         }
 
         /// <summary>This function is used to set integer properties on Filter objects.</summary>
@@ -779,7 +809,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void Filter( int fid, Enums.EfxFilteri param, int value )
         {
-            Imported_alFilteri( (uint)fid, param, value );
+            Imported_alFilteri( (uint) fid, param, value );
         }
 
         #endregion alFilteri
@@ -787,7 +817,7 @@ namespace OpenTK.OpenAL
         #region alFilterf
 
         //[CLSCompliant(false)]
-        private delegate void Delegate_alFilterf( uint fid,Enums.EfxFilterf param,float value );
+        private delegate void Delegate_alFilterf( uint fid, Enums.EfxFilterf param, float value );
         // typedef void (__cdecl *LPALFILTERF)( ALuint fid, ALenum param, ALfloat value);
 
         //[CLSCompliant(false)]
@@ -797,10 +827,10 @@ namespace OpenTK.OpenAL
         /// <param name="fid">Filter object identifier.</param>
         /// <param name="param">Effect property to set.</param>
         /// <param name="value">Floating point value.</param>
-        [CLSCompliant(false)]
-        public void Filter( uint fid,Enums.EfxFilterf param,float value )
+        [CLSCompliant( false )]
+        public void Filter( uint fid, Enums.EfxFilterf param, float value )
         {
-            Imported_alFilterf(fid,param,value);
+            Imported_alFilterf( fid, param, value );
         }
 
         /// <summary>This function is used to set floating point properties on Filter objects.</summary>
@@ -810,7 +840,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void Filter( int fid, Enums.EfxFilterf param, float value )
         {
-            Imported_alFilterf( (uint)fid, param, value );
+            Imported_alFilterf( (uint) fid, param, value );
         }
 
         #endregion alFilterf
@@ -818,7 +848,7 @@ namespace OpenTK.OpenAL
         #region alGetFilteri
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alGetFilteri( uint fid,Enums.EfxFilteri pname,[Out] int* value );
+        unsafe private delegate void Delegate_alGetFilteri( uint fid, Enums.EfxFilteri pname, [Out] int* value );
         // typedef void (__cdecl *LPALGETFILTERI)( ALuint fid, ALenum pname, ALint* value );
 
         //[CLSCompliant(false)]
@@ -828,14 +858,14 @@ namespace OpenTK.OpenAL
         /// <param name="fid">Filter object identifier.</param>
         /// <param name="pname">Effect property to retrieve.</param>
         /// <param name="value">Address where integer value will be stored.</param>
-        [CLSCompliant(false)]
-        public void GetFilter( uint fid,Enums.EfxFilteri pname,out int value )
+        [CLSCompliant( false )]
+        public void GetFilter( uint fid, Enums.EfxFilteri pname, out int value )
         {
             unsafe
             {
                 fixed ( int* ptr = &value )
                 {
-                    Imported_alGetFilteri(fid,pname,ptr);
+                    Imported_alGetFilteri( fid, pname, ptr );
                 }
             }
         }
@@ -855,7 +885,7 @@ namespace OpenTK.OpenAL
         #region alGetFilterf
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alGetFilterf( uint fid,Enums.EfxFilterf pname,[Out] float* value );
+        unsafe private delegate void Delegate_alGetFilterf( uint fid, Enums.EfxFilterf pname, [Out] float* value );
         // typedef void (__cdecl *LPALGETFILTERF)( ALuint fid, ALenum pname, ALfloat* value );
 
         //[CLSCompliant(false)]
@@ -865,14 +895,14 @@ namespace OpenTK.OpenAL
         /// <param name="fid">Filter object identifier.</param>
         /// <param name="pname">Effect property to retrieve.</param>
         /// <param name="value">Address where floating point value will be stored.</param>
-        [CLSCompliant(false)]
-        public void GetFilter( uint fid,Enums.EfxFilterf pname,out float value )
+        [CLSCompliant( false )]
+        public void GetFilter( uint fid, Enums.EfxFilterf pname, out float value )
         {
             unsafe
             {
                 fixed ( float* ptr = &value )
                 {
-                    Imported_alGetFilterf(fid,pname,ptr);
+                    Imported_alGetFilterf( fid, pname, ptr );
                 }
             }
         }
@@ -902,7 +932,7 @@ namespace OpenTK.OpenAL
         #region alGenAuxiliaryEffectSlots
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alGenAuxiliaryEffectSlots( int n,[Out] uint* slots );
+        unsafe private delegate void Delegate_alGenAuxiliaryEffectSlots( int n, [Out] uint* slots );
         // typedef void (__cdecl *LPALGENAUXILIARYEFFECTSLOTS)( ALsizei n, ALuint* slots );
 
         //[CLSCompliant(false)]
@@ -912,14 +942,14 @@ namespace OpenTK.OpenAL
         /// <remarks>An application should check the OpenAL error state after making this call to determine if the Effect Slot was successfully created. If the function call fails then none of the requested Effect Slots are created. A good strategy for creating any OpenAL object is to use a for-loop and generate one object each loop iteration and then check for an error condition. If an error is set then the loop can be broken and the application can determine if sufficient resources are available.</remarks>
         /// <param name="n">Number of Auxiliary Effect Slots to be created.</param>
         /// <param name="slots">Pointer addressing sufficient memory to store n Effect Slot object identifiers.</param>
-        [CLSCompliant(false)]
-        public void GenAuxiliaryEffectSlots( int n,out uint slots )
+        [CLSCompliant( false )]
+        public void GenAuxiliaryEffectSlots( int n, out uint slots )
         {
             unsafe
             {
                 fixed ( uint* ptr = &slots )
                 {
-                    Imported_alGenAuxiliaryEffectSlots(n,ptr);
+                    Imported_alGenAuxiliaryEffectSlots( n, ptr );
                     slots = *ptr;
                 }
             }
@@ -935,7 +965,7 @@ namespace OpenTK.OpenAL
             uint[] temp = new uint[n];
             GenAuxiliaryEffectSlots( n, out temp[0] );
             slots = new int[n];
-            for ( int i = 0; i < n; i++ )
+            for ( int i = 0 ; i < n ; i++ )
             {
                 slots[i] = (int) temp[i];
             }
@@ -943,10 +973,9 @@ namespace OpenTK.OpenAL
 
         /// <summary>The GenAuxiliaryEffectSlots function is used to create one or more Auxiliary Effect Slots. The number of slots that can be created will be dependant upon the Open AL device used.</summary>
         /// <remarks>An application should check the OpenAL error state after making this call to determine if the Effect Slot was successfully created. If the function call fails then none of the requested Effect Slots are created. A good strategy for creating any OpenAL object is to use a for-loop and generate one object each loop iteration and then check for an error condition. If an error is set then the loop can be broken and the application can determine if sufficient resources are available.</remarks>
-        /// <param name="n">Number of Auxiliary Effect Slots to be created.</param>
         /// <param name="slots">Pointer addressing sufficient memory to store n Effect Slot object identifiers.</param>
         [CLSCompliant( true )]
-        public void GenAuxiliaryEffectSlots(  int[] slots )
+        public void GenAuxiliaryEffectSlots( int[] slots )
         {
             uint[] temp = new uint[slots.Length];
             GenAuxiliaryEffectSlots( temp.Length, out temp[0] );
@@ -955,25 +984,41 @@ namespace OpenTK.OpenAL
                 slots[i] = (int) temp[i];
             }
         }
-       
+
+        /// <summary>The GenAuxiliaryEffectSlots function is used to create one or more Auxiliary Effect Slots. The number of slots that can be created will be dependant upon the Open AL device used.</summary>
+        /// <remarks>An application should check the OpenAL error state after making this call to determine if the Effect Slot was successfully created. If the function call fails then none of the requested Effect Slots are created. A good strategy for creating any OpenAL object is to use a for-loop and generate one object each loop iteration and then check for an error condition. If an error is set then the loop can be broken and the application can determine if sufficient resources are available.</remarks>
+        /// <param name="n">Number of Auxiliary Effect Slots to be created.</param>
+        /// <returns>Pointer addressing sufficient memory to store n Effect Slot object identifiers.</returns>
+        [CLSCompliant( true )]
+        public int[] GenAuxiliaryEffectSlots( int n )
+        {
+            uint[] temp = new uint[n];
+            GenAuxiliaryEffectSlots( temp.Length, out temp[0] );
+            int[] slots = new int[n];
+            for ( int i = 0 ; i < temp.Length ; i++ )
+            {
+                slots[i] = (int) temp[i];
+            }
+            return slots;
+        }
+
         /// <summary>This function generates only one Auxiliary Effect Slot.</summary>
         /// <param name="slot">Storage UInt32 for the new auxiliary effect slot name/handle.</param>
         [CLSCompliant( false )]
-            public void GenAuxiliaryEffectSlots( out uint slot )
+        public void GenAuxiliaryEffectSlots( out uint slot )
         {
             unsafe
             {
                 fixed ( uint* ptr = &slot )
                 {
-                    Imported_alGenAuxiliaryEffectSlots(1,ptr);
+                    Imported_alGenAuxiliaryEffectSlots( 1, ptr );
                 }
             }
         }
 
-         
         /// <summary>This function generates only one Auxiliary Effect Slot.</summary>
         /// <param name="slot">Storage UInt32 for the new auxiliary effect slot name/handle.</param>
-        [CLSCompliant( true)]
+        [CLSCompliant( true )]
         public void GenAuxiliaryEffectSlots( out int slot )
         {
             uint temp;
@@ -982,9 +1027,9 @@ namespace OpenTK.OpenAL
         }
 
         /// <summary>This function generates only one Auxiliary Effect Slot.</summary>
-        /// <param name="slot">Storage UInt32 for the new auxiliary effect slot name/handle.</param>
+        /// <returns>Storage UInt32 for the new auxiliary effect slot name/handle.</returns>
         [CLSCompliant( true )]
-        public int GenAuxiliaryEffectSlots(  )
+        public int GenAuxiliaryEffectSlots( )
         {
             uint temp;
             GenAuxiliaryEffectSlots( out temp );
@@ -996,7 +1041,7 @@ namespace OpenTK.OpenAL
         #region alDeleteAuxiliaryEffectSlots
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alDeleteAuxiliaryEffectSlots( int n,[In] uint* slots );
+        unsafe private delegate void Delegate_alDeleteAuxiliaryEffectSlots( int n, [In] uint* slots );
         // typedef void (__cdecl *LPALDELETEAUXILIARYEFFECTSLOTS)( ALsizei n, ALuint* slots );
 
         //[CLSCompliant(false)]
@@ -1005,14 +1050,14 @@ namespace OpenTK.OpenAL
         /// <summary>The DeleteAuxiliaryEffectSlots function is used to delete and free resources for Auxiliary Effect Slots previously created with GenAuxiliaryEffectSlots.</summary>
         /// <param name="n">Number of Auxiliary Effect Slots to be deleted.</param>
         /// <param name="slots">Pointer to n Effect Slot object identifiers.</param>
-        [CLSCompliant(false)]
-        public void DeleteAuxiliaryEffectSlots( int n,ref uint[] slots )
+        [CLSCompliant( false )]
+        public void DeleteAuxiliaryEffectSlots( int n, ref uint[] slots )
         {
             unsafe
             {
                 fixed ( uint* ptr = slots )
                 {
-                    Imported_alDeleteAuxiliaryEffectSlots(n,ptr);
+                    Imported_alDeleteAuxiliaryEffectSlots( n, ptr );
                 }
             }
         }
@@ -1024,7 +1069,7 @@ namespace OpenTK.OpenAL
         public void DeleteAuxiliaryEffectSlots( int n, ref int[] slots )
         {
             uint[] temp = new uint[n];
-            for ( int i = 0; i < n; i++ )
+            for ( int i = 0 ; i < n ; i++ )
             {
                 temp[i] = (uint) slots[i];
             }
@@ -1047,14 +1092,14 @@ namespace OpenTK.OpenAL
 
         /// <summary>This function deletes one AuxiliaryEffectSlot only.</summary>
         /// <param name="slot">Pointer to an auxiliary effect slot name/handle identifying the Auxiliary Effect Slot Object to be deleted.</param>
-        [CLSCompliant(false)]
+        [CLSCompliant( false )]
         public void DeleteAuxiliaryEffectSlots( ref uint slot )
         {
             unsafe
             {
                 fixed ( uint* ptr = &slot )
                 {
-                    Imported_alDeleteAuxiliaryEffectSlots(1,ptr);
+                    Imported_alDeleteAuxiliaryEffectSlots( 1, ptr );
                 }
             }
         }
@@ -1091,19 +1136,19 @@ namespace OpenTK.OpenAL
         /// <summary>The IsAuxiliaryEffectSlot function is used to determine if an object identifier is a valid Auxiliary Effect Slot object.</summary>
         /// <param name="slot">Effect Slot object identifier to validate.</param>
         /// <returns>True if the identifier is a valid Auxiliary Effect Slot, False otherwise.</returns>
-        [CLSCompliant(false)]
+        [CLSCompliant( false )]
         public bool IsAuxiliaryEffectSlot( uint slot )
         {
-            return Imported_alIsAuxiliaryEffectSlot(slot);
+            return Imported_alIsAuxiliaryEffectSlot( slot );
         }
 
         /// <summary>The IsAuxiliaryEffectSlot function is used to determine if an object identifier is a valid Auxiliary Effect Slot object.</summary>
         /// <param name="slot">Effect Slot object identifier to validate.</param>
         /// <returns>True if the identifier is a valid Auxiliary Effect Slot, False otherwise.</returns>
-        [CLSCompliant(true)]
+        [CLSCompliant( true )]
         public bool IsAuxiliaryEffectSlot( int slot )
         {
-            return Imported_alIsAuxiliaryEffectSlot( (uint)slot );
+            return Imported_alIsAuxiliaryEffectSlot( (uint) slot );
         }
 
         #endregion alIsAuxiliaryEffectSlot
@@ -1111,7 +1156,7 @@ namespace OpenTK.OpenAL
         #region alAuxiliaryEffectSloti
 
         //[CLSCompliant(false)]
-        private delegate void Delegate_alAuxiliaryEffectSloti( uint asid,Enums.EfxAuxiliaryi param,int value );
+        private delegate void Delegate_alAuxiliaryEffectSloti( uint asid, Enums.EfxAuxiliaryi param, int value );
         // typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum param, ALint value ); 
 
         //[CLSCompliant(false)]
@@ -1121,10 +1166,10 @@ namespace OpenTK.OpenAL
         /// <param name="asid">Auxiliary Effect Slot object identifier.</param>
         /// <param name="param">Auxiliary Effect Slot property to set.</param>
         /// <param name="value">Integer value.</param>
-        [CLSCompliant(false)]
-        public void AuxiliaryEffectSlot( uint asid,Enums.EfxAuxiliaryi param,int value )
+        [CLSCompliant( false )]
+        public void AuxiliaryEffectSlot( uint asid, Enums.EfxAuxiliaryi param, int value )
         {
-            Imported_alAuxiliaryEffectSloti(asid,param,value);
+            Imported_alAuxiliaryEffectSloti( asid, param, value );
         }
 
         /// <summary>This function is used to set integer properties on Auxiliary Effect Slot objects.</summary>
@@ -1134,7 +1179,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void AuxiliaryEffectSlot( int asid, Enums.EfxAuxiliaryi param, int value )
         {
-            Imported_alAuxiliaryEffectSloti( (uint)asid, param, value );
+            Imported_alAuxiliaryEffectSloti( (uint) asid, param, value );
         }
 
         #endregion alAuxiliaryEffectSloti
@@ -1142,7 +1187,7 @@ namespace OpenTK.OpenAL
         #region alAuxiliaryEffectSlotf
 
         //[CLSCompliant(false)]
-        private delegate void Delegate_alAuxiliaryEffectSlotf( uint asid,Enums.EfxAuxiliaryf param,float value );
+        private delegate void Delegate_alAuxiliaryEffectSlotf( uint asid, Enums.EfxAuxiliaryf param, float value );
         // typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTF)( ALuint asid, ALenum param, ALfloat value );
 
         //[CLSCompliant(false)]
@@ -1152,10 +1197,10 @@ namespace OpenTK.OpenAL
         /// <param name="asid">Auxiliary Effect Slot object identifier.</param>
         /// <param name="param">Auxiliary Effect Slot property to set.</param>
         /// <param name="value">Floating point value.</param>
-        [CLSCompliant(false)]
-        public void AuxiliaryEffectSlot( uint asid,Enums.EfxAuxiliaryf param,float value )
+        [CLSCompliant( false )]
+        public void AuxiliaryEffectSlot( uint asid, Enums.EfxAuxiliaryf param, float value )
         {
-            Imported_alAuxiliaryEffectSlotf(asid,param,value);
+            Imported_alAuxiliaryEffectSlotf( asid, param, value );
         }
 
         /// <summary>This function is used to set floating point properties on Auxiliary Effect Slot objects.</summary>
@@ -1165,7 +1210,7 @@ namespace OpenTK.OpenAL
         [CLSCompliant( true )]
         public void AuxiliaryEffectSlot( int asid, Enums.EfxAuxiliaryf param, float value )
         {
-            Imported_alAuxiliaryEffectSlotf( (uint)asid, param, value );
+            Imported_alAuxiliaryEffectSlotf( (uint) asid, param, value );
         }
 
         #endregion alAuxiliaryEffectSlotf
@@ -1173,7 +1218,7 @@ namespace OpenTK.OpenAL
         #region alGetAuxiliaryEffectSloti
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alGetAuxiliaryEffectSloti( uint asid,Enums.EfxAuxiliaryi pname,[Out] int* value );
+        unsafe private delegate void Delegate_alGetAuxiliaryEffectSloti( uint asid, Enums.EfxAuxiliaryi pname, [Out] int* value );
         // typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum pname, ALint* value );
 
         //[CLSCompliant(false)]
@@ -1183,14 +1228,14 @@ namespace OpenTK.OpenAL
         /// <param name="asid">Auxiliary Effect Slot object identifier.</param>
         /// <param name="pname">Auxiliary Effect Slot property to retrieve.</param>
         /// <param name="value">Address where integer value will be stored.</param>
-        [CLSCompliant(false)]
-        public void GetAuxiliaryEffectSlot( uint asid,Enums.EfxAuxiliaryi pname,out int value )
+        [CLSCompliant( false )]
+        public void GetAuxiliaryEffectSlot( uint asid, Enums.EfxAuxiliaryi pname, out int value )
         {
             unsafe
             {
                 fixed ( int* ptr = &value )
                 {
-                    Imported_alGetAuxiliaryEffectSloti(asid,pname,ptr);
+                    Imported_alGetAuxiliaryEffectSloti( asid, pname, ptr );
                 }
             }
         }
@@ -1210,7 +1255,7 @@ namespace OpenTK.OpenAL
         #region alGetAuxiliaryEffectSlotf
 
         //[CLSCompliant(false)]
-        unsafe private delegate void Delegate_alGetAuxiliaryEffectSlotf( uint asid,Enums.EfxAuxiliaryf pname,[Out] float* value );
+        unsafe private delegate void Delegate_alGetAuxiliaryEffectSlotf( uint asid, Enums.EfxAuxiliaryf pname, [Out] float* value );
         // typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTF)( ALuint asid, ALenum pname, ALfloat* value );
 
         //[CLSCompliant(false)]
@@ -1220,19 +1265,19 @@ namespace OpenTK.OpenAL
         /// <param name="asid">Auxiliary Effect Slot object identifier.</param>
         /// <param name="pname">Auxiliary Effect Slot property to retrieve.</param>
         /// <param name="value">Address where floating point value will be stored.</param>
-        [CLSCompliant(false)]
-        public void GetAuxiliaryEffectSlot( uint asid,Enums.EfxAuxiliaryf pname,out float value )
+        [CLSCompliant( false )]
+        public void GetAuxiliaryEffectSlot( uint asid, Enums.EfxAuxiliaryf pname, out float value )
         {
             unsafe
             {
                 fixed ( float* ptr = &value )
                 {
-                    Imported_alGetAuxiliaryEffectSlotf(asid,pname,ptr);
+                    Imported_alGetAuxiliaryEffectSlotf( asid, pname, ptr );
                 }
             }
         }
 
-         /// <summary>This function is used to retrieve floating properties on Auxiliary Effect Slot objects.</summary>
+        /// <summary>This function is used to retrieve floating properties on Auxiliary Effect Slot objects.</summary>
         /// <param name="asid">Auxiliary Effect Slot object identifier.</param>
         /// <param name="pname">Auxiliary Effect Slot property to retrieve.</param>
         /// <param name="value">Address where floating point value will be stored.</param>
@@ -1258,65 +1303,70 @@ namespace OpenTK.OpenAL
 
         /// <summary>Returns True if the EFX Extension has been found and could be initialized.</summary>
         public bool IsInitialized
-        { get { return _valid; } }
+        {
+            get
+            {
+                return _valid;
+            }
+        }
 
         public EfxExtension( )
         {
             _valid = false;
 
-            if ( Alc.IsExtensionPresent(Alc.GetContextsDevice(Alc.GetCurrentContext( )),"ALC_EXT_EFX") == false )
+            if ( Alc.IsExtensionPresent( Alc.GetContextsDevice( Alc.GetCurrentContext( ) ), "ALC_EXT_EFX" ) == false )
             {
-                Trace.WriteLine("Efx Extension ALC_EXT_EFX is unknown to the Device.");
+                Trace.WriteLine( "Efx Extension ALC_EXT_EFX is unknown to the Device." );
                 return;
             }
             // Console.WriteLine("ALC_EXT_EFX found. Efx can be used.");
 
             try
             {
-                Imported_alGenEffects = (Delegate_alGenEffects) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alGenEffects"),typeof(Delegate_alGenEffects));
-                Imported_alDeleteEffects = (Delegate_alDeleteEffects) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alDeleteEffects"),typeof(Delegate_alDeleteEffects));
-                Imported_alIsEffect = (Delegate_alIsEffect) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alIsEffect"),typeof(Delegate_alIsEffect));
-                Imported_alEffecti = (Delegate_alEffecti) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alEffecti"),typeof(Delegate_alEffecti));
-                Imported_alEffectf = (Delegate_alEffectf) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alEffectf"),typeof(Delegate_alEffectf));
-                Imported_alEffectfv = (Delegate_alEffectfv) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alEffectfv"),typeof(Delegate_alEffectfv));
-                Imported_alGetEffecti = (Delegate_alGetEffecti) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alGetEffecti"),typeof(Delegate_alGetEffecti));
-                Imported_alGetEffectf = (Delegate_alGetEffectf) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alGetEffectf"),typeof(Delegate_alGetEffectf));
-                Imported_alGetEffectfv = (Delegate_alGetEffectfv) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alGetEffectfv"),typeof(Delegate_alGetEffectfv));
+                Imported_alGenEffects = (Delegate_alGenEffects) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alGenEffects" ), typeof( Delegate_alGenEffects ) );
+                Imported_alDeleteEffects = (Delegate_alDeleteEffects) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alDeleteEffects" ), typeof( Delegate_alDeleteEffects ) );
+                Imported_alIsEffect = (Delegate_alIsEffect) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alIsEffect" ), typeof( Delegate_alIsEffect ) );
+                Imported_alEffecti = (Delegate_alEffecti) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alEffecti" ), typeof( Delegate_alEffecti ) );
+                Imported_alEffectf = (Delegate_alEffectf) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alEffectf" ), typeof( Delegate_alEffectf ) );
+                Imported_alEffectfv = (Delegate_alEffectfv) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alEffectfv" ), typeof( Delegate_alEffectfv ) );
+                Imported_alGetEffecti = (Delegate_alGetEffecti) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alGetEffecti" ), typeof( Delegate_alGetEffecti ) );
+                Imported_alGetEffectf = (Delegate_alGetEffectf) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alGetEffectf" ), typeof( Delegate_alGetEffectf ) );
+                Imported_alGetEffectfv = (Delegate_alGetEffectfv) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alGetEffectfv" ), typeof( Delegate_alGetEffectfv ) );
             } catch ( Exception e )
             {
-                Trace.WriteLine("Failed to marshal Effect functions. " + e.ToString( ));
+                Trace.WriteLine( "Failed to marshal Effect functions. " + e.ToString( ) );
                 return;
             }
             // Console.WriteLine("Effect functions appear to be ok.");
 
             try
             {
-                Imported_alGenFilters = (Delegate_alGenFilters) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alGenFilters"),typeof(Delegate_alGenFilters));
-                Imported_alDeleteFilters = (Delegate_alDeleteFilters) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alDeleteFilters"),typeof(Delegate_alDeleteFilters));
-                Imported_alIsFilter = (Delegate_alIsFilter) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alIsFilter"),typeof(Delegate_alIsFilter));
-                Imported_alFilteri = (Delegate_alFilteri) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alFilteri"),typeof(Delegate_alFilteri));
-                Imported_alFilterf = (Delegate_alFilterf) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alFilterf"),typeof(Delegate_alFilterf));
-                Imported_alGetFilteri = (Delegate_alGetFilteri) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alGetFilteri"),typeof(Delegate_alGetFilteri));
-                Imported_alGetFilterf = (Delegate_alGetFilterf) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alGetFilterf"),typeof(Delegate_alGetFilterf));
+                Imported_alGenFilters = (Delegate_alGenFilters) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alGenFilters" ), typeof( Delegate_alGenFilters ) );
+                Imported_alDeleteFilters = (Delegate_alDeleteFilters) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alDeleteFilters" ), typeof( Delegate_alDeleteFilters ) );
+                Imported_alIsFilter = (Delegate_alIsFilter) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alIsFilter" ), typeof( Delegate_alIsFilter ) );
+                Imported_alFilteri = (Delegate_alFilteri) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alFilteri" ), typeof( Delegate_alFilteri ) );
+                Imported_alFilterf = (Delegate_alFilterf) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alFilterf" ), typeof( Delegate_alFilterf ) );
+                Imported_alGetFilteri = (Delegate_alGetFilteri) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alGetFilteri" ), typeof( Delegate_alGetFilteri ) );
+                Imported_alGetFilterf = (Delegate_alGetFilterf) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alGetFilterf" ), typeof( Delegate_alGetFilterf ) );
             } catch ( Exception e )
             {
-                Trace.WriteLine("Failed to marshal Filter functions. " + e.ToString( ));
+                Trace.WriteLine( "Failed to marshal Filter functions. " + e.ToString( ) );
                 return;
             }
             // Console.WriteLine("Filter functions appear to be ok.");
 
             try
             {
-                Imported_alGenAuxiliaryEffectSlots = (Delegate_alGenAuxiliaryEffectSlots) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alGenAuxiliaryEffectSlots"),typeof(Delegate_alGenAuxiliaryEffectSlots));
-                Imported_alDeleteAuxiliaryEffectSlots = (Delegate_alDeleteAuxiliaryEffectSlots) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alDeleteAuxiliaryEffectSlots"),typeof(Delegate_alDeleteAuxiliaryEffectSlots));
-                Imported_alIsAuxiliaryEffectSlot = (Delegate_alIsAuxiliaryEffectSlot) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alIsAuxiliaryEffectSlot"),typeof(Delegate_alIsAuxiliaryEffectSlot));
-                Imported_alAuxiliaryEffectSloti = (Delegate_alAuxiliaryEffectSloti) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alAuxiliaryEffectSloti"),typeof(Delegate_alAuxiliaryEffectSloti));
-                Imported_alAuxiliaryEffectSlotf = (Delegate_alAuxiliaryEffectSlotf) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alAuxiliaryEffectSlotf"),typeof(Delegate_alAuxiliaryEffectSlotf));
-                Imported_alGetAuxiliaryEffectSloti = (Delegate_alGetAuxiliaryEffectSloti) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alGetAuxiliaryEffectSloti"),typeof(Delegate_alGetAuxiliaryEffectSloti));
-                Imported_alGetAuxiliaryEffectSlotf = (Delegate_alGetAuxiliaryEffectSlotf) Marshal.GetDelegateForFunctionPointer(AL.GetProcAddress("alGetAuxiliaryEffectSlotf"),typeof(Delegate_alGetAuxiliaryEffectSlotf));
+                Imported_alGenAuxiliaryEffectSlots = (Delegate_alGenAuxiliaryEffectSlots) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alGenAuxiliaryEffectSlots" ), typeof( Delegate_alGenAuxiliaryEffectSlots ) );
+                Imported_alDeleteAuxiliaryEffectSlots = (Delegate_alDeleteAuxiliaryEffectSlots) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alDeleteAuxiliaryEffectSlots" ), typeof( Delegate_alDeleteAuxiliaryEffectSlots ) );
+                Imported_alIsAuxiliaryEffectSlot = (Delegate_alIsAuxiliaryEffectSlot) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alIsAuxiliaryEffectSlot" ), typeof( Delegate_alIsAuxiliaryEffectSlot ) );
+                Imported_alAuxiliaryEffectSloti = (Delegate_alAuxiliaryEffectSloti) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alAuxiliaryEffectSloti" ), typeof( Delegate_alAuxiliaryEffectSloti ) );
+                Imported_alAuxiliaryEffectSlotf = (Delegate_alAuxiliaryEffectSlotf) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alAuxiliaryEffectSlotf" ), typeof( Delegate_alAuxiliaryEffectSlotf ) );
+                Imported_alGetAuxiliaryEffectSloti = (Delegate_alGetAuxiliaryEffectSloti) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alGetAuxiliaryEffectSloti" ), typeof( Delegate_alGetAuxiliaryEffectSloti ) );
+                Imported_alGetAuxiliaryEffectSlotf = (Delegate_alGetAuxiliaryEffectSlotf) Marshal.GetDelegateForFunctionPointer( AL.GetProcAddress( "alGetAuxiliaryEffectSlotf" ), typeof( Delegate_alGetAuxiliaryEffectSlotf ) );
             } catch ( Exception e )
             {
-                Trace.WriteLine("Failed to marshal AuxiliaryEffectSlot functions. " + e.ToString( ));
+                Trace.WriteLine( "Failed to marshal AuxiliaryEffectSlot functions. " + e.ToString( ) );
                 return;
             }
             // Console.WriteLine("Auxiliary Effect Slot functions appear to be ok.");