Lot's of minor fixes.