no more nil-in-table
16 files changed