Very minor changes.
Switching back to CLASSPATH as library inclusion mechanism.