Many fixes / improvements
Fixes