save and continue bug fixes