Pitch scale and bug fix