Added new listeners, fixed bugs, etc