Reworking Java-based links
Fully linking Java now, I think.