more IM work, tidying up, and back to the old bootstrap