Bunch of updates and some fixes