A slew of fixes.  :P