laundry list of fixes