Added ActivityHandler and changed some other stuff