some fixes_v_2