change command tid to wiki and some bug fixes
some bug fixes and refinement