Marfa: Update from February 19th

Added languages: English, Chinese; - Fixed some bugs and bugs.