Further fixes
Working almost perfect