Merger Stuff & Fixing timeToDeath

Merger Stuff & Fixing timeToDeath