Fixed initalization issues caused by recent refactoring and verified a few cards