a lot of awesome improvements