checkpoints and various fixes