Lot's of fixes.