Ckpt - fix a few things, complete thru rmaps