More wiki progress. Change code to Java 6.