more tidying

collision is still broken?