improvements on multi card lib