Replaced all instances of Vector and Hashtable with List and Vector (respectively)
Merge branch 'update-collections'