last fixes_1
merge