Fix issue #160 and #143

Fix issue #160 and #143, rebuild the table environment, add some text about the conclusion and add the chapter to the content.