collision

collision added, minor cleanup
collision