Fix some fields that I broke and standardize others.