Updates to scripts and setup