checkpointing: beefing up client and fixing small things throughout