Bunch of improvements