Tried to adjust all of Edward's comments