Intergrated changes + fixes