Rotate fix, minor collision bug remains