A bunch of assorted changes because otters.