rework all scripts for production use