2009-09-09 insilmaril more fixes for collision detection