fc_subscoremat changes + tests