Check that the BT values are encrypted
Fix expiration date encryption issue
Fix some weird whitespace issues