Fixing scripts and adding new commands