completition for snapshotCmds + minor fixes