JDK7 syntax upgrade
Enhanced javadoc (a bit)