Fixed teleporting problem and added Deflection.

There are some minor issues with deflection that may be easier to fix
when friction is implemented.