Fixed memory leak, cleaned up makefile, valgrind approves and speed is good.