Add more keys to explicit rerun inputs
Improve scripts
Fix bug in script