Lot's of fixes