position and rotation improvements