fixed merge problems (collision detection code reverted back) when Paul's code was merged.  Didn't pay enough attention.