Fix ordering and spacing
Add RANGE and ID macros and arrays
Colonel is abbreviated COL