Lot of fixes.