diff --git a/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebra.cs b/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebra.cs
index ebc15ee2..eb7d43eb 100644
--- a/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebra.cs
+++ b/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebra.cs
@@ -33,7 +33,7 @@ namespace MathNet.Numerics.Algorithms.LinearAlgebra
         /// Adds a scaled vector to another: <c>y += alpha*x</c>.
         /// </summary>
         /// <param name="y">The vector to update.</param>
-        /// <param name="alpha">The value to scale <param name="x"/> by.</param>
+        /// <param name="alpha">The value to scale <paramref name="x"/> by.</param>
         /// <param name="x">The vector to add to <paramref name="y"/>.</param>
         /// <remarks>This is equivalent to the AXPY BLAS routine.</remarks>
         void AddVectorToScaledVector(double[] y, double alpha, double[] x);
diff --git a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebra.cs b/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebra.cs
index 22d5beae..dab836da 100644
--- a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebra.cs
+++ b/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebra.cs
@@ -35,7 +35,7 @@ namespace MathNet.Numerics.Algorithms.LinearAlgebra
         /// Adds a scaled vector to another: <c>y += alpha*x</c>.
         /// </summary>
         /// <param name="y">The vector to update.</param>
-        /// <param name="alpha">The value to scale <param name="x"/> by.</param>
+        /// <param name="alpha">The value to scale <paramref name="x"/> by.</param>
         /// <param name="x">The vector to add to <paramref name="y"/>.</param>
         /// <remarks>This equivalent to the AXPY BLAS routine.</remarks>
         public void AddVectorToScaledVector(double[] y, double alpha, double[] x)
diff --git a/src/Numerics/Threading/Parallel.cs b/src/Numerics/Threading/Parallel.cs
index b49c19ca..813e7796 100644
--- a/src/Numerics/Threading/Parallel.cs
+++ b/src/Numerics/Threading/Parallel.cs
@@ -146,30 +146,30 @@ namespace MathNet.Numerics.Threading
             {
                 var start = fromInclusive + (i * size);
                 var stop = fromInclusive + ((i + 1) * size);
-                tasks[i] = new Task<T>(intial,
+                tasks[i] = new Task<T>(
                     localData =>
                     {
                         var localresult = localData;
                         for (var j = start; j < stop; j++)
                         {
-                            localresult = body(j, localresult);
+                            localresult = body(j, (T)localresult);
                         }
-                        return localresult;
-                    } );
+                        return (T)localresult;
+                    }, intial );
                 ThreadQueue.Enqueue(tasks[i]);
             }
 
             // add another set for last worker thread
-            tasks[tasks.Length - 1] = new Task<T>(intial,
+            tasks[tasks.Length - 1] = new Task<T>(
                     localData =>
                     {
                         var localresult = localData;
                         for (var i = fromInclusive + ((tasks.Length - 1) * size); i < toExclusive; i++)
                         {
-                            localresult = body(i, localresult);
+                            localresult = body(i, (T)localresult);
                         }
-                        return localresult;
-                    } );
+                        return (T)localresult;
+                    }, intial );
 
             ThreadQueue.Enqueue(tasks[tasks.Length - 1]);
             if (tasks.Length <= 0)
@@ -257,7 +257,7 @@ namespace MathNet.Numerics.Threading
         }
 
         /// <summary>
-        /// Executes a for each operation on an IEnumerable<TSource> in which iterations may run in parallel.
+        /// Executes a for each operation on an IEnumerable{TSource in which iterations may run in parallel.
         /// </summary>
         /// <typeparam name="TSource">The type of the data in the source.</typeparam>
         /// <typeparam name="TLocal">The type of the thread-local data.</typeparam>
@@ -293,16 +293,16 @@ namespace MathNet.Numerics.Threading
                     count++;
                 }
 
-                var task = new Task<TLocal>(intial,
+                var task = new Task<TLocal>(
                     localData =>
                     {
                         var localresult = localData;
                         for (var i = 0; i < pos; i++)
                         {
-                            localresult = body(list[i], localresult);
+                            localresult = body(list[i], (TLocal)localresult);
                         }
-                        return localresult;
-                    });
+                        return (TLocal)localresult;
+                    }, intial);
 
                 ThreadQueue.Enqueue(task);
                 tasks.Add(task);
@@ -398,19 +398,10 @@ namespace MathNet.Numerics.Threading
         /// <param name="tasks">The tasks.</param>
         private static void WaitForTasksToComplete(Task[] tasks)
         {
-            // wait until all tasks have  been completed
-            if (Thread.CurrentThread.GetApartmentState() == ApartmentState.STA)
-            {
-                // not sure if this the best approach for STA
-                for (var i = 0; i < tasks.Length; i++)
-                {
-                    tasks[i].WaitOne();
-                }
-            }
-            else
-            {
-                WaitHandle.WaitAll(tasks);
-            }
+             for (var i = 0; i < tasks.Length; i++)
+             {
+                    tasks[i].Wait();
+             }
         }
 
         /// <summary>
@@ -423,13 +414,10 @@ namespace MathNet.Numerics.Threading
             var exceptions = new List<Exception>();
             foreach (var task in tasks)
             {
-                if (task.ThrewException)
+                if (task.IsFaulted)
                 {
                     exceptions.Add(task.Exception);
                 }
-
-                // this calls dispose
-                task.Close();
             }
 
             // throw the aggregated exceptions, if any
diff --git a/src/Numerics/Threading/Task.cs b/src/Numerics/Threading/Task.cs
index 72ace2c3..33dd438f 100644
--- a/src/Numerics/Threading/Task.cs
+++ b/src/Numerics/Threading/Task.cs
@@ -34,7 +34,7 @@ namespace MathNet.Numerics.Threading
     /// <summary>
     /// Internal Parallel Task Handle.
     /// </summary>
-    internal class Task : EventWaitHandle
+    internal class Task
     {
         /// <summary>
         /// Delegate to the task's action.
@@ -45,8 +45,7 @@ namespace MathNet.Numerics.Threading
         /// Initializes a new instance of the Task class.
         /// </summary>
         /// <param name="body">Delegate to the task's action.</param>
-        internal Task(Action body)
-            : this()
+        public Task(Action body)
         {
             if (body == null)
             {
@@ -56,79 +55,114 @@ namespace MathNet.Numerics.Threading
             _body = body;
         }
 
-        protected Task() : base(false, EventResetMode.ManualReset) { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Task"/> class.
+        /// </summary>
+        protected Task()
+        {
+        }
 
         /// <summary>
-        /// Gets a value indicating whether the task has thrown one or more exceptions while executing.
+        /// Gets a value indicating whether the task completed due to an unhandled exception.
         /// </summary>
-        internal bool ThrewException
+        /// <value>
+        ///     <c>true</c> if this task completed due to an unhandled exception; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsFaulted
         {
             get { return Exception != null; }
         }
 
         /// <summary>
-        /// Gets the exception thrown by the task, if any.
+        /// Gets a value indicating whether this task has completed.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if this task has completed; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsCompleted
+        {
+            get; private set;
+        }
+
+        /// <summary>
+        /// Gets or sets the exception thrown by the task, if any.
         /// </summary>
-        protected internal Exception Exception { get; set; }
+        public Exception Exception { get; set; }
 
         /// <summary>
         /// Run the task.
         /// </summary>
-        internal virtual void Compute()
+        public void Compute()
         {
             try
             {
-                _body();
+                DoCompute();
+                IsCompleted = true;
             }
             catch (Exception e)
             {
                 Exception = e;
             }
         }
+
+        /// <summary>
+        /// Runs the actual task.
+        /// </summary>
+        protected virtual void DoCompute()
+        {
+            _body();
+        }
+
+        public void Wait()
+        {
+            while(!IsCompleted && !IsFaulted)
+            {
+                Thread.Sleep(100);
+            }
+            
+        }
     }
 
     /// <summary>
     /// Internal Generic Parallel Task Handle.
     /// </summary>
-    internal class Task<T> : Task
+    internal class Task<TResult> : Task
     {
         /// <summary>
         /// Delegate to the task's action.
         /// </summary>
-        private readonly Func<T, T> _body;
-
-        //private T _initialValue;
+        private readonly Func<object, TResult> _body;
 
-        public T Result { get; private set; }
+        private readonly object _state;
+        
+        /// <summary>
+        /// Gets the result of the task.
+        /// </summary>
+        /// <value>The result of the task.</value>
+        public TResult Result { get; private set; }
 
         /// <summary>
         /// Initializes a new instance of the Task class.
         /// </summary>
-        /// <param name="intialValue">The initial value.</param>
+        /// <param name="state">An object representing data to be used by the action.</param>
         /// <param name="body">Delegate to the task's action.</param>
-        internal Task(T intialValue, Func<T, T> body)
+        public Task(Func<object, TResult> body, object state)
         {
             if (body == null)
             {
                 throw new ArgumentNullException("body");
             }
-            Result = intialValue;
+
+            _state = state;
             _body = body;
         }
 
         /// <summary>
-        /// Run the task.
+        /// Runs the actual task.
         /// </summary>
-        internal override void Compute()
+        protected override void DoCompute()
         {
-            try
-            {
-                Result = _body(Result);
-            }
-            catch (Exception e)
-            {
-                Exception = e;
-            }
+            Result = _body(_state);
         }
     }
 }
diff --git a/src/Numerics/Threading/ThreadQueue.cs b/src/Numerics/Threading/ThreadQueue.cs
index 555b41c9..b83a9c1b 100644
--- a/src/Numerics/Threading/ThreadQueue.cs
+++ b/src/Numerics/Threading/ThreadQueue.cs
@@ -176,7 +176,7 @@ namespace MathNet.Numerics.Threading
 
                 // ...and run it
                 task.Compute();
-                task.Set();
+                //task.Set();
             }
         }