Fix logic for 'hit_or_stand'; various improvements