Category fra_cm1 & fra_cm2 + minor cosmetics

Signed-off-by: JB Touchard <jbt@txtnet.com>