more fixes to among_my_souvenirs