Add necessary information and fix some comments from Nxun