Use javac to compile
Lots of PSImporter fixes