A bunch of updates and tweaks