some more work on deployment plus some more Java8-ification