lots of classpath and other fixes