General bugfixes.  Cleaned up some of the unneccesary phrases.