finished fixes