Revert "Updates to scripts to fix errors with new nn+ update"

This reverts commit e91a59b8e911763805ec2f6e268c2972f3cf6305.
Fixes to scripts because of the new nn version changes.
More fixes
Another batch of fixes
Bugfixes and typos
More fixes
Merge pull request #120 from DariusIII/dev

Dev