Lot of improvements
Fixes fixes