collisions working, still more bugs