Bunch of fixes and new changes