Second commit

Added death listeners, timers, team manager updates and overall
improvements