fix annotations; fix javadoc options