few fixes 4
few fixes 5