Removed the loop of doom death. and fixed another issue with messages