Minor changes to assign and assign_setup
Merge branch 'master' of https://github.com/madisonmay/Scripting