Updating with minor changes.  Removing unused commands.  Getting rid of commented code.