Fixed a major bug.  Improved speed further.