Added a whole bunch of tweaks.