couple of fixes to make card data more secure