Lot's of fixes from the first run through