Updated scripts to make setup easier