bug fixes

fixed ace card, cleaned up code to be more efficient, minor bug fixes