Lots of great fixes.