Fixed classpath issue and other minor issues.