clean up TODOs, add player Bypass event