Changed/fixed some variables and types in Analysis.rsc

Mostly tried to fix some errors due to some wrong types and variable names; tried to rename them to something that seemed to make sense with regards to the context and how the types turned ount. @anyahelene does this look okay? 

Also removed Model.rsc since it was a duplicate of Analysis.rsc.