Refactor difficulties, add pitch names