fixed remove event listener call, and corrected the boolean.