1st bach of fixes