Mass tweaks and fixes.