field updates + last min tweaks