Updates to scripts and cleaning up mason branch to merge with master