more changes

still needs debugging and variable valuation for Aces