Rotation bug fully fixed, slightly faster?