credit card type returns a string now based on an enummap, misc other fixes