Many changes
Bugs corrections