Your proposed modifications sound okay as long as you properly detail each of these changes in much more detail in your final submission.
