Updated TODO
Fixed java compiler warning
Fixing valgrind errors and leaks