CRC Checkin

Enable CRC and other minor formatting changes.