Add comments; Add log file