updated to newest java code (now with xenon instead of octopus, and updated interface)
fix flags in makefiles