fixing bugs and removing credit card stuff for now