Fixed a few bugs.  Removed unnecessary