cleanup and some comments
working collision tests