Reworked the Java connection handler a bit.