Move fix and comments added to Servo