Fix fixing of Makefile to be pmake compatible.
Remove TODO list as it is incorporated into the wiki.
Add the CLI and JVM instances to the options list.