Updated main file to reflect doxygen syntax for input variable names.  Also updated variable names to be more reflective of what they actually are.