Bugs fixed and add new listeners