Made changes that correspond to the following JIRA
http://tintin.cs.indiana.edu:8091/browse/PSU-111
http://tintin.cs.indiana.edu:8091/browse/PSU-117