fixed unicode, moved js