Added some changes covering Mathias's commentaries.