Bunch of fixes and updates