Yangman - improvements