PWM cleanup
G2 alignment