Rotation! And more fixes!