finished fixes for today