more javafix wip