Fixed all the errors that had resulted from last merge, which were due to use of a hashset with arrayList access methods