Each of these changes will need to be a separate Issue/Pull Request.