Improved a shitload of stuff.