javadoc updates
fixed some findbugs warnings