fixing typos, etc. within the program.  Preparing model for unit testing.