Bunch more editorial fixes