Improving scripts and setups