Add more harmonic rhythm options. Fix a horrible edge case bug in parse_rhythm.