Tweaked things a big more.
Made a few performance enhancements.