Fix checkpoint parse, comments.

Fix checkpoint parse, comments. #528