Fixed locking block issue and radians/degrees dilemma