collision filtering and motion refinements

small changes