cosmetic changes. added new listener etc
nothing that changes the way everything works