Bunch of updates - few commits