Final? changes to addresses for javascript in SetMaker