Major fixes to IGM