Added Rollingstock in paragraph scope
Updated mode of the variables.  Added Svitlana suggestions from my last pull request
Merge branch 'EFSMainbranch/master'