Lots of fixes

-I don't remember....
Lots of fixes