Lot of fixes according to real test
System is quite working, needs refines and more of course tough