fix up collision detector a bit with more tests
refactor unused variables and internal methods