Improved a fair bit of code.