added openjdk, terra and some minor tweaks