Added and/or improved javadoc comments