Fix CRJ-700/900 and module formatting...