Lot's of fixes...