Your proposed modifications sound okay, but you will need to be more clear [more detailed] on each of these in your final submission.
