More constants and javadoc