classpath fix
bug fixes, added features