javadocs, some reordering to colocate use of same fields