Deal with Aces better, and tidy up messages to player