Continue cleanup of Software scripts; formally add category Software
Reusing variable names in children was causing a problem with parent scripts when run in the same context