clear up and rotation problem fix