Cleaning up
Fixes to IC matrix