obstacle collision improvements