fixup
refutoring
support rst & ping