Bunch of improvements lol