Split apart listener
Fix up listeners
Update changelog