Added checkpoints and long term run fixes