A lot of fixes
A lot of fixes