Added ID listing to table, fixes