Fixed some errors and updated lists.