Fix makefile (default target Java version removed) + update TODO list