* chore: squash commit * fix: tweak some mentioned issues --------- Co-authored-by: incubator4 <aries0robin@gmail.com>