Made sure all traps are good..

and fixed TrapDamage a little.