more tweaks as fields are added