Sounds pretty cool! Though the idea of "it is running slower than 0.36" is slightly depressing, I know there is much to be done, and in the end - it will be much different.
It is good that you did some spring cleaning with the code - makes it easier to find mistakes, no?