Improvements

- Revamped the execution choices.
- Improve overall script, less errors to be made.