Damn, a lot of improvements at once