Implement MrRean's rendering improvements, and other stuff.