More minor tweaks
Added correct listeners