added javadoc comments and updated config ready for 1.5