Various tweaks and First Draft IF stage