finished fixes 1