Fixed table capitalization, add comments