Improvements and bug fixes to click scripts
This will create a new commit in order to revert the existing changes.