Made a number of changes.