Added boolean to contact listener, fixed bugs