lot of fixes