Removing debug cout and changing some messages