remove some more unecessary logging and get basic collision working (with tests)