Comment cleanup
Fixed checkpoint logic for the master mode