Tweaks and imc work