Added avengers timer, bugfixes