many fixes 2