CHG: Polarization updates and other bug fixes