Collision fixes. closes #62