Fixes javadoc warnings, missing header, minor cleanup