Fixed a few harmonic issues