[REF] Remove fatal, fix some code comments