minor bug fix and add remark column