corrections
commited for @@rhy-jot review