lot of fixes...