Added / improved javadoc at annotations.