merge Shibei Pian
and fix typos of @Fsu0413
and fucking JadeSeal