Collision improved (changed subject that detects collision) but still has bugs.