Simpler Checkpoint & Other Fixes