several more tweaks (mostly member re-orders) for gcc-warnings