Fixed another couple memory leaks, only 3 Valgrind warnings left