Fixing some formatting and adding additional CRN fields