Fixed feedForward bug and improved running time