fixed some more aces bugs