add missing annotations and a few findbugs fixes.