load of fixes