minor logic fixes!

seriously mateo we even named the event listener the same