checkpoins + other minor changes

84.3 checkpoints , minor changes