Lots o' fixes.