Fixed Trap bugs and game killer