Modified scripts to go with production setup (minor tweaks) + some improvements