Improved several things.