Add table of concepts and some minor adjustments