fixed consolidating javafx changes
ditto