Updates to scripts and helper files