some fixes G_srodek and