Add TomDoc info, made variable names more descriptive, consistent use of "