Code cleanup, added death tracking, added wipe announcment