Updates to ICMs

Fixes #118 
Fixes #71