fixed classpath, other minor cleanup