More stuff, fix #1

\u3113