Code

some changes, utf-8 design etc