Updated Java instructions and other improvements