fixed some bugs, still need to refactor and get the Ace counting right