just fix PR comments, dev to be continued