card stacking bug fixes
various fixes