Some fixes
Made some mergin