A bunch of updates including some overzap fixes.
