Collision refined. Fixed wall stuck bug