changed some listener registration things