More javadoc yak shaving
keep checkstyle happy…
corrected deprecations