Chean up.  Removed some things.  Added some things.