Fixed API eventlisteners

Added WAIT_LIST_UPDATE
Added missing removals in close