fix
lot of fixes