fixed traps (still wip)