Bunch of improvements to combat