Lots of minor, mostly layout fixes.