a lot of fixes
a lot of fixes
cleaning