Add comments support, fix broken links