Fixed Code that was breaking the Build

I fixed a lot of the newly added parallel code that was breaking the
build. The header files were not quite synched with the code files
(specifically the .cu and .cuh files)