Add classpath, misc changes