Added some changes to the collision stuff

when in grab state it ignores other collisions