Adjustments to classpath, minor varaible renaming