Update roll, other minor tweaks.