diff --git a/app/lib/aether_utils.coffee b/app/lib/aether_utils.coffee
index 90c421d2d..ef2ec5ffc 100644
--- a/app/lib/aether_utils.coffee
+++ b/app/lib/aether_utils.coffee
@@ -13,6 +13,7 @@ module.exports.createAetherOptions = (options) ->
     skipDuplicateUserInfoInFlow: true  # Optimization that won't work if we are stepping with frames
     yieldConditionally: options.functionName is 'plan'
     simpleLoops: true
+    whileTrueAutoYield: options.whileTrueAutoYield ? false
     globals: ['Vector', '_']
     problems:
       jshint_W040: {level: 'ignore'}
diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee
index 6d264db87..611885a5c 100644
--- a/app/locale/lt.coffee
+++ b/app/locale/lt.coffee
@@ -1,44 +1,44 @@
 module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lithuanian", translation:
-#  home:
-#    slogan: "Learn to Code by Playing a Game"
-#    no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older
-#    no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices
-#    play: "Play" # The big play button that opens up the campaign view.
+  home:
+    slogan: "Išmok programuoti žaisdamas!"
+    no_ie: "CodeCombat su naršykle Internet Explorer 8 arba senesne. Atleiskite!" # Warning that only shows up in IE8 and older
+    no_mobile: "CodeCombat neskirtas mobiliems įrenginiams ir gali veikti neteisingai!" # Warning that shows up on mobile devices
+    play: "Žaisti" # The big play button that opens up the campaign view.
 #    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari
 #    old_browser_suffix: "You can try anyway, but it probably won't work."
 #    ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval."
 #    campaign: "Campaign"
-#    for_beginners: "For Beginners"
+    for_beginners: "Naujokams"
 #    multiplayer: "Multiplayer" # Not currently shown on home page
 #    for_developers: "For Developers" # Not currently shown on home page.
-#    or_ipad: "Or download for iPad"
+    or_ipad: "Arba atsisiųskite iPad'ui"
 
-#  nav:
-#    play: "Levels" # The top nav bar entry where players choose which levels to play
-#    community: "Community"
-#    editor: "Editor"
-#    blog: "Blog"
-#    forum: "Forum"
-#    account: "Account"
-#    profile: "Profile"
-#    stats: "Stats"
+  nav:
+    play: "Lygiai" # The top nav bar entry where players choose which levels to play
+    community: "Bendruomenė"
+    editor: "Redaktorius"
+    blog: "Blog'as"
+    forum: "Forumas"
+    account: "Paskyra"
+    profile: "Profilis"
+    stats: "Statistika"
 #    code: "Code"
 #    admin: "Admin" # Only shows up when you are an admin
-#    home: "Home"
+    home: "Pradžia"
 #    contribute: "Contribute"
 #    legal: "Legal"
-#    about: "About"
-#    contact: "Contact"
-#    twitter_follow: "Follow"
-#    teachers: "Teachers"
-#    careers: "Careers"
+    about: "Apie"
+    contact: "Kontaktai"
+    twitter_follow: "Sekti Twitter"
+    teachers: "Mokytojai"
+    careers: "Karjera"
 
-#  modal:
-#    close: "Close"
-#    okay: "Okay"
+  modal:
+    close: "Uždaryti"
+    okay: "OK"
 
-#  not_found:
-#    page_not_found: "Page not found"
+  not_found:
+    page_not_found: "Puslapis nerastas"
 
   diplomat_suggestion:
 #    title: "Help translate CodeCombat!" # This shows up when a player switches to a non-English language using the language selector.
@@ -48,32 +48,32 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    learn_more: "Learn more about being a Diplomat"
 #    subscribe_as_diplomat: "Subscribe as a Diplomat"
 
-#  play:
-#    play_as: "Play As" # Ladder page
-#    spectate: "Spectate" # Ladder page
-#    players: "players" # Hover over a level on /play
-#    hours_played: "hours played" # Hover over a level on /play
-#    items: "Items" # Tooltip on item shop button from /play
-#    unlock: "Unlock" # For purchasing items and heroes
-#    confirm: "Confirm"
-#    owned: "Owned" # For items you own
-#    locked: "Locked"
-#    purchasable: "Purchasable" # For a hero you unlocked but haven't purchased
+  play:
+    play_as: "Žaisti kaip" # Ladder page
+    spectate: "Stebėtojas" # Ladder page
+    players: "žaidėjai" # Hover over a level on /play
+    hours_played: "valandų žaista" # Hover over a level on /play
+    items: "Daiktai" # Tooltip on item shop button from /play
+    unlock: "Atrakinti" # For purchasing items and heroes
+    confirm: "Tvirtinti"
+    owned: "Turima" # For items you own
+    locked: "Užrakinta"
+    purchasable: "Perkamas" # For a hero you unlocked but haven't purchased
 #    available: "Available"
 #    skills_granted: "Skills Granted" # Property documentation details
-#    heroes: "Heroes" # Tooltip on hero shop button from /play
-#    achievements: "Achievements" # Tooltip on achievement list button from /play
-#    account: "Account" # Tooltip on account button from /play
-#    settings: "Settings" # Tooltip on settings button from /play
-#    poll: "Poll" # Tooltip on poll button from /play
-#    next: "Next" # Go from choose hero to choose inventory before playing a level
-#    change_hero: "Change Hero" # Go back from choose inventory to choose hero
-#    choose_inventory: "Equip Items"
+    heroes: "Herojai" # Tooltip on hero shop button from /play
+    achievements: "Pasiekimai" # Tooltip on achievement list button from /play
+    account: "Paskyra" # Tooltip on account button from /play
+    settings: "Nustatymai" # Tooltip on settings button from /play
+    poll: "Apklausa" # Tooltip on poll button from /play
+    next: "Kitas" # Go from choose hero to choose inventory before playing a level
+    change_hero: "Keisti Herojų" # Go back from choose inventory to choose hero
+    choose_inventory: "Naudoti daiktus"
 #    buy_gems: "Buy Gems"
 #    subscription_required: "Subscription Required"
 #    anonymous: "Anonymous Player"
-#    level_difficulty: "Difficulty: "
-#    campaign_beginner: "Beginner Campaign"
+    level_difficulty: "Sudėtingumas: "
+    campaign_beginner: "Naujoko kampanija"
 #    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 467fc38dd..feb9503d5 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -1,17 +1,17 @@
 module.exports = nativeDescription: "简体中文", englishDescription: "Chinese (Simplified)", translation:
   home:
-    slogan: "通过游戏学习编程"
-    no_ie: "抱歉！ Internet Explorer 8 等老式浏览器无法使用本网站。" # Warning that only shows up in IE8 and older
-    no_mobile: "CodeCombat不是针对手机设备设计的，所以可能无法达到最好的体验！" # Warning that shows up on mobile devices
+    slogan: "通过玩游戏学习编程"
+    no_ie: "抱歉！Internet Explorer 8 等旧式浏览器无法使用本网站。" # Warning that only shows up in IE8 and older
+    no_mobile: "CodeCombat不是针对移动设备设计的，所以可能无法达到最佳体验！" # Warning that shows up on mobile devices
     play: "开始游戏" # The big play button that opens up the campaign view.
-    old_browser: "噢, 您的浏览器太老了, 不能运行CodeCombat。抱歉!" # Warning that shows up on really old Firefox/Chrome/Safari
-    old_browser_suffix: "您可以继续重试下去，但八成不起作用，更新浏览器吧亲～"
-    ipad_browser: "坏消息:CodeCombat无法在iPad的浏览器中运行。好消息：我们的iPad应用正在等待苹果公司审批。"
+    old_browser: "噢, 您的浏览器版本太旧了, 不能运行CodeCombat。抱歉!" # Warning that shows up on really old Firefox/Chrome/Safari
+    old_browser_suffix: "您可以继续重试下去，但很可能不起作用，更新浏览器吧亲～"
+    ipad_browser: "坏消息:CodeCombat无法在iPad的浏览器中运行。好消息：我们的iPad应用正在等待苹果公司审核通过。"
     campaign: "战役模式"
     for_beginners: "适合初学者"
     multiplayer: "多人游戏" # Not currently shown on home page
     for_developers: "适合开发者" # Not currently shown on home page.
-    or_ipad: "或下载入iPad"
+    or_ipad: "或下载iPad版本"
 
   nav:
     play: "关卡选择" # The top nav bar entry where players choose which levels to play
@@ -43,7 +43,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
   diplomat_suggestion:
     title: "帮助我们翻译CodeCombat" # This shows up when a player switches to a non-English language using the language selector.
     sub_heading: "我们需要您的语言技能"
-    pitch_body: "我们开发了英文版的CodeCombat，但是CodeCombat的玩家遍布全球。对于不熟悉英语的中文玩家，他们希望能玩简体中文版的CodeCombat，如果您中英文都很熟练，考虑加入我们“外交官”行列并参与CodeCombat的翻译，帮忙把CodeCombat网站和所有关卡翻译成简体中文。感谢！"
+    pitch_body: "我们开发了英文版的CodeCombat，但是CodeCombat的玩家遍布全球。对于不熟悉英语的中文玩家，他们希望能玩简体中文版的CodeCombat，如果您中英文都很熟练，请考虑加入我们“外交官”行列并参与CodeCombat的翻译，帮忙把CodeCombat网站和所有关卡翻译成简体中文。感谢！"
     missing_translations: "没被翻译的文字将以英文显示。"
     learn_more: "了解更多成为翻译人员的说明"
     subscribe_as_diplomat: "提交翻译人员申请"
@@ -81,7 +81,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     campaign_multiplayer: "多人竞技场"
     campaign_multiplayer_description: "……在这里您可以与其他玩家进行代码肉搏战。"
     campaign_old_multiplayer: "（过时的）旧的多人竞技场"
-    campaign_old_multiplayer_description: "多个文明时代的遗迹。但已没有模拟运行这些陈旧、英雄芜绝的多人竞技场。"
+    campaign_old_multiplayer_description: "多个文明时代的遗迹。但已经不再模拟运行这些陈旧、英雄芜绝的多人竞技场。"
 
   share_progress_modal:
     blurb: "您的进度真快！快告诉您的家长, 您从CodeCombat学到了什么！"
@@ -119,8 +119,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     recovery_sent: "找回账户邮件已发送。"
 
   items:
-    primary: "主要武器"
-    secondary: "次要武器"
+    primary: "主武器"
+    secondary: "副武器"
     armor: "盔甲"
     accessories: "配饰"
     misc: "辅助道具"
@@ -158,10 +158,10 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     pending: "处理中"
     accepted: "已接受"
     rejected: "未接受"
-    withdrawn: "撤回"
-#    accept: "Accept"
-#    reject: "Reject"
-#    withdraw: "Withdraw"
+    withdrawn: "已撤回"
+    accept: "接受"
+    reject: "拒絕"
+    withdraw: "撤回"
     submitter: "提交者"
     submitted: "已提交"
     commit_msg: "提交信息"
@@ -195,8 +195,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     hard: "困难"
     player: "玩家"
     player_level: "等级" # Like player level 5, not like level: Dungeons of Kithgard
-    warrior: "武士"
-    ranger: "巡逻兵"
+    warrior: "战士"
+    ranger: "游骑兵"
     wizard: "巫师"
 
   units:
@@ -217,8 +217,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 
   play_level:
     done: "完成"
-#    next_game: "Next game"
-#    show_menu: "Show game menu"
+    next_game: "下一场游戏"
+    show_menu: "显示游戏菜单"
     home: "主页" # Not used any more, will be removed soon.
     level: "关卡" # Like "Level: Dungeons of Kithgard"
     skip: "跳过"
@@ -289,7 +289,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     non_user_code_problem_title: "不能读入关卡"
     infinite_loop_title: "有无限循环"
     infinite_loop_description: "建立世界的初始代码永远不会运行完毕。这可能是真的运行的很慢或者陷入了一个死循环。又或者可能存在bug。您可以尝试再次运行该代码，或者将代码重置为默认状态。如果仍旧解决不了，请告诉我们。"
-    check_dev_console: "您也可以打开开发者界面看一下有什么东西出错了。"
+    check_dev_console: "您也可以打开开发者界面查看有什么东西出错了。"
     check_dev_console_link: "(说明)"
     infinite_loop_try_again: "重试"
     infinite_loop_reset_level: "重置关卡"
@@ -318,7 +318,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tip_patience: "您必须要有耐心，年轻的学徒 - 尤达大师《星球大战》"
     tip_documented_bug: "一个写在文档里的漏洞不算漏洞, 那是个特色。"
     tip_impossible: "在事情未完成之前，一切都看似不可能。 - 纳尔逊·曼德拉"
-    tip_talk_is_cheap: "多说无用, 亮出您的代码。 - Linus Torvalds"
+    tip_talk_is_cheap: "多说无用, 放码过来。 - Linus Torvalds"
     tip_first_language: "您所经历过最可怕的事情是您的第一门编程语言。 - Alan Kay"
     tip_hardware_problem: "问：换一个电灯泡需要几位程序员参与？答：一个都不需要，因为这属于硬件问题。"
     tip_hofstadters_law: "侯世达定律：做事所花费的时间总是比您预期的要长，即使您的预期中考虑了侯世达定律。"
@@ -342,8 +342,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tip_recurse: "迭代为人，递归为神 - L. Peter Deutsch"
     tip_free_your_mind: "丢掉一切私心杂念，丢掉害怕、疑问和拒信，解放您的思想。 - Morpheus《黑客帝国》"
     tip_strong_opponents: "即使是最强大的对手也是有弱点的。- 宇智波鼬《火影忍者》"
-    tip_paper_and_pen: "在您开始编码之前，您可以随时用一张纸和一支笔作计划。"
-#    solve_then_write: "First, solve the problem. Then, write the code. - John Johnson"
+    tip_paper_and_pen: "在您开始编程之前，您可以随时用一张纸和一支笔提前规划。"
+    solve_then_write: "第一步，思考解决方案。第二步，编写代码。 - John Johnson"
 
   game_menu:
     inventory_tab: "道具箱"
@@ -840,93 +840,93 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     last_played: "最后玩了"
     leagues_explanation: "在部落里与其他成员组成联盟一起参加下面的多人竞技场。"
 
-#  courses:
-#    course: "Course"
-#    courses: "courses"
-#    not_enrolled: "You are not enrolled in this course."
-#    visit_pref: "Please visit the"
-#    visit_suf: "page to enroll."
-#    select_class: "Select one of your classes"
-#    unnamed: "*unnamed*"
-#    select: "Select"
-#    unnamed_class: "Unnamed Class"
-#    edit_settings: "edit class settings"
-#    edit_settings1: "Edit Class Settings"
-#    progress: "Class Progress"
-#    add_students: "Add Students"
-#    stats: "Statistics"
-#    total_students: "Total students:"
-#    average_time: "Average level play time:"
-#    total_time: "Total play time:"
-#    average_levels: "Average levels completed:"
-#    total_levels: "Total levels completed:"
-#    furthest_level: "Furthest level completed:"
-#    concepts_covered: "Concepts Covered"
-#    students: "Students"
-#    students1: "students"
-#    expand_details: "Expand details"
-#    concepts: "Concepts"
-#    levels: "levels"
-#    played: "Played"
-#    play_time: "Play time:"
-#    completed: "Completed:"
-#    invite_students: "Invite students to join this class."
-#    invite_link_header: "Link to join course"
-#    invite_link_p_1: "Give this link to students you would like to have join the course."
-#    invite_link_p_2: "Or have us email them directly:"
-#    capacity_used: "Course slots used:"
-#    enter_emails: "Enter student emails to invite, one per line"
-#    send_invites: "Send Invites"
-#    title: "Title"
-#    description: "Description"
-#    languages_available: "Select programming languages available to the class:"
-#    all_lang: "All Languages"
-#    show_progress: "Show student progress to everyone in the class"
-#    creating_class: "Creating class..."
-#    purchasing_course: "Purchasing course..."
-#    buy_course: "Buy Course"
-#    buy_course1: "Buy this course"
-#    create_class: "Create Class"
-#    select_all_courses: "Select 'All Courses' for a 50% discount!"
-#    all_courses: "All Courses"
-#    number_students: "Number of students"
-#    enter_number_students: "Enter the number of students you need for this class."
-#    name_class: "Name your class"
-#    displayed_course_page: "This will be displayed on the course page for you and your students. It can be changed later."
-#    buy: "Buy"
-#    purchasing_for: "You are purchasing a license for"
-#    creating_for: "You are creating a class for"
-#    for: "for" # Like in 'for 30 students'
-#    receive_code: "Afterwards you will receive an unlock code to distribute to your students, which they can use to enroll in your class."
-#    free_trial: "Free trial for teachers!"
-#    get_access: "to get individual access to all courses for evalutaion purposes."
-#    questions: "Questions?"
-#    faq: "Courses FAQ"
-#    question: "Q:" # Like in 'Question'
-#    question1: "What's the difference between these courses and the single player game?"
-#    answer: "A:" # Like in 'Answer'
-#    answer1: "The single player game is designed for individuals, while the courses are designed for classes."
-#    answer2: "The single player game has items, gems, hero selection, leveling up, and in-app purchases. Courses have classroom management features and streamlined student-focused level pacing."
-#    teachers_click: "Teachers Click Here"
-#    students_click: "Students Click Here"
-#    courses_on_coco: "Courses on CodeCombat"
-#    designed_to: "Courses are designed to introduce computer science concepts using CodeCombat's fun and engaging environment. CodeCombat levels are organized around key topics to encourage progressive learning, over the course of 5 hours."
-#    more_in_less: "Learn more in less time"
-#    no_experience: "No coding experience necesssary"
-#    easy_monitor: "Easily monitor student progress"
-#    purchase_for_class: "Purchase a course for your entire class. It's easy to sign up your students!"
-#    see_the: "See the"
-#    more_info: "for more information."
-#    choose_course: "Choose Your Course:"
-#    enter_code: "Enter an unlock code to join an existing class"
-#    enter_code1: "Enter unlock code"
-#    enroll: "Enroll"
-#    pick_from_classes: "Pick from your current classes"
-#    enter: "Enter"
-#    or: "Or"
-#    topics: "Topics"
-#    hours_content: "Hours of content:"
-#    get_free: "Get FREE course"
+  courses:
+    course: "课程"
+    courses: "课程" #gonna see the script to determine the translation
+    not_enrolled: "您还没有报名参加本课程。"
+    visit_pref: "请到这个"
+    visit_suf: "网页注册。"
+    select_class: "请选其中一门班级"
+    unnamed: "*未命名*"
+    select: "选择"
+    unnamed_class: "班级未命名"
+    edit_settings: "编辑班级设定"
+    edit_settings1: "编辑班级设定"
+    progress: "班级进度"
+    add_students: "添加学生"
+    stats: "统计"
+    total_students: "学生人数："
+    average_time: "平均游戏时间："
+    total_time: "总计游戏时间："
+    average_levels: "平均完成关卡："
+    total_levels: "总共完成关卡："
+    furthest_level: "最高关卡完成："
+    concepts_covered: "课目覆盖"
+    students: "学生"
+    students1: "个学生"
+    expand_details: "展开细节"
+    concepts: "课目"
+    levels: "关卡"
+    played: "已通关"
+    play_time: "游戏时间："
+    completed: "完成："
+    invite_students: "邀请学生加入此班级。"
+    invite_link_header: "参与班级的縺结"
+    invite_link_p_1: "分享给您想分享的其他人以加入课程。" #this translation may need to change
+    invite_link_p_2: "或让我们代你直接发送电邮："
+    capacity_used: "课程插槽已用：" # course slots? kinda in chinese
+    enter_emails: "输入学生电邮地​​址来邀请，每行一个"
+    send_invites: "发送邀请"
+    title: "标题"
+    description: "描述"
+    languages_available: "选择编程语言："
+    all_lang: "所有编程语言"
+    show_progress: "向所有该班级的人展示学生的进度" # translation may need to change
+    creating_class: "班级创建中..."
+    purchasing_course: "购买课程中..."
+    buy_course: "购买课程"
+    buy_course1: "购买这个课程"
+    create_class: "创建班级"
+    select_all_courses: "可半价一次购买所有课程！"
+    all_courses: "所有课程"
+    number_students: "学生人数"
+    enter_number_students: "输入该班级的学生上限人数"
+    name_class: "命名您的班级"
+    displayed_course_page: "这将会在课程页面显示，可被修改。"
+    buy: "购买"
+    purchasing_for: "你正在购买许可证，课程为"
+    creating_for: "您正在创建一个课程为"
+    for: "人数上限为" # Like in 'for 30 students'
+    receive_code: "然后您会收到一个解锁码，把它分发给你的学生用来注册你的班级。"
+    free_trial: "老师可免费试用"
+    get_access: "获得个人使用权在评估的目的下来使用所有课程。"
+    questions: "有疑问？"
+    faq: "课程FAQ"
+    question: "问：" # Like in 'Question'
+    question1: "这些课程和单人游戏之间的有什么区别？"
+    answer: "答：" # Like in 'Answer'
+    answer1: "单人游戏是专为个人而设，而课程是专为班级而设。"
+    answer2: "在單人遊戲中有物品、寶石、英雄選擇、練級、和內購應用。課程有課堂管理功能，和老師可根據學生的水平而調整教學進度。"
+    teachers_click: "老师点击这里"
+    students_click: "学生点击这里"
+    courses_on_coco: "CodeCombat上的课程"
+    designed_to: "CodeCombat課程的宗旨是在使用CodeCombat生動有趣的環境下教授計算機科學的課目。整個CodeCombat的關卡是圍繞著計算機科學的重點，並激勵學生們自主向上學習在5小時的過程內。"
+    more_in_less: "以最少的时间学习最多的知识"
+    no_experience: "无需编程经验"
+    easy_monitor: "容易管理学生的进程"
+    purchase_for_class: "为你的班级购买CodeCombat课程，让签到和管理变得更容易！"
+    see_the: "详细资讯请看"
+    more_info: "。"
+    choose_course: "选择您的课程："
+    enter_code: "输入一个解锁码来加入已存在的班级"
+    enter_code1: "输入解锁码"
+    enroll: "注册"
+    pick_from_classes: "从目前的课程选择"
+    enter: "输入"
+    or: "或"
+    topics: "题目"
+    hours_content: "内容时间："
+    get_free: "取得免费课程！"
 
   classes:
     archmage_title: "大法师"
@@ -1120,7 +1120,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     simulate_games: "模拟游戏！"
     games_simulated_by: "由您模拟过的游戏数:"
     games_simulated_for: "为您模拟过的游戏数:"
-#    games_in_queue: "Games currently in the queue:"
+    games_in_queue: "游戏正在列队中："
     games_simulated: "模拟次数"
     games_played: "被模拟次数"
     ratio: "比率"
@@ -1157,7 +1157,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     fight: "战斗！"
     watch_victory: "观看您的胜利"
     defeat_the: "击败了"
-#    watch_battle: "Watch the battle"
+    watch_battle: "观看战役"
     tournament_started: "，锦标赛已开始"
     tournament_ends: "锦标赛结束"
     tournament_ended: "锦标赛已结束"
@@ -1215,7 +1215,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     no_recent_games: "最近两个星期没有玩过游戏。"
     payments: "支付方式"
     prepaid: "预付费"
-#    prepaid_codes: "Prepaid Codes"
+    prepaid_codes: "预付费码"
     purchased: "已购买"
     sale: "促销"
     subscription: "订阅"
@@ -1246,13 +1246,13 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     retrying: "服务器错误，重试中。"
     success: "支付成功。谢谢！"
 
-#  account_prepaid:
-#    purchase_code: "Purchase a Subscription Code"
-#    purchase_amount: "Amount"
-#    purchase_total: "Total"
-#    purchase_button: "Submit Purchase"
-#    your_codes: "Your Codes:"
-#    redeem_codes: "Redeem a Subscription Code"
+  account_prepaid:
+    purchase_code: "购买订阅码"
+    purchase_amount: "数量"
+    purchase_total: "总共"
+    purchase_button: "提交购买"
+    your_codes: "你的订阅码："
+    redeem_codes: "兑换订阅码"
 
   loading_error:
     could_not_load: "载入失败"
@@ -1420,7 +1420,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     rights_clarification: "澄清：所有在关卡编辑器里公开用于制作关卡的资源都是在CC协议下发布的，而使用关卡编辑器制作，或者在关卡制作过程中上传的内容则不是。"
     nutshell_title: "简而言之"
     nutshell_description: "我们在关卡编辑器里公开的任何资源，您都可以在制作关卡时随意使用，但我们保留限制在CodeCombat.com 之上创建的关卡本身传播的权利，因为我们以后可能决定为它们收费。"
-    canonical: "这篇说明的英文版本是权威版本。如果各个翻译版本之间有任何冲突，以英文版为准。"
+    canonical: "这篇说明的英文版本是权威版本。如果各个翻译版本之间有任何冲突，请以英文版为准。"
 
   ladder_prizes:
     title: "竞标赛奖项" # This section was for an old tournament and doesn't need new translations now.
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index 16ea4eaba..b324a7117 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -31,7 +31,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     contact: "聯繫我們"
     twitter_follow: "在 Twitter 關注"
     teachers: "教師"
-#    careers: "Careers"
+    careers: "招聘"
 
   modal:
     close: "關閉"
@@ -158,10 +158,10 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     pending: "處理中"
     accepted: "已接受"
     rejected: "未接受"
-    withdrawn: "撤回"
-#    accept: "Accept"
-#    reject: "Reject"
-#    withdraw: "Withdraw"
+    withdrawn: "已撤回"
+    accept: "接受"
+    reject: "拒絕"
+    withdraw: "撤回"
     submitter: "提交者"
     submitted: "已提交"
     commit_msg: "送出訊息"
@@ -217,8 +217,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 
   play_level:
     done: "完成"
-#    next_game: "Next game"
-#    show_menu: "Show game menu"
+    next_game: "下一個遊戲"
+    show_menu: "顯示遊戲菜單"
     home: "首頁" # Not used any more, will be removed soon.
     level: "關卡" # Like "Level: Dungeons of Kithgard"
     skip: "跳過"
@@ -869,15 +869,15 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     levels: "關卡"
     played: "已通關"
     play_time: "遊戲時間："
-    completed: "遊戲時間："
+    completed: "完成："
     invite_students: "邀請學生加入此課堂。"
     invite_link_header: "參與課堂的縺結"
-    invite_link_p_1: "把這個參與課堂的連結發給你認可的學生。"
+    invite_link_p_1: "把這個參與課堂的連結發給你的學生。"
     invite_link_p_2: "或讓我們代你直接發送電郵："
-    capacity_used: "Course slots used:"
+    capacity_used: "課堂插槽己用："
     enter_emails: "輸入學生電郵地址來邀請，每行一個"
     send_invites: "發送邀請"
-    title: "發送邀請"
+    title: "標題"
     description: "描述"
     languages_available: "選擇編程語言："
     all_lang: "所有編程語言"
@@ -890,7 +890,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     select_all_courses: "可半價一次購買所有課程！"
     all_courses: "所有課程"
     number_students: "學生人數"
-    enter_number_students: "輪入該課堂的學生上限人數"
+    enter_number_students: "輸入該課堂的學生上限人數"
     name_class: "命名您的課堂"
     displayed_course_page: "這將會在課程頁面顯示，可被修改。"
     buy: "購買"
@@ -910,7 +910,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     teachers_click: "老師點擊這裡"
     students_click: "學生點擊這裡"
     courses_on_coco: "CodeCombat上的課程"
-    designed_to: "CodeCombat課程的宗旨是在使用CodeCombat生動有趣的環境下教授計算機科學的課目。整個CodeCombat的關卡是圍繞著計算機科學的重點並激勵學生們自主向上學習在5小時的過程。"
+    designed_to: "CodeCombat課程的宗旨是在使用CodeCombat生動有趣的環境下教授計算機科學的課目。整個CodeCombat的關卡是圍繞著計算機科學的重點，並激勵學生們自主向上學習在5小時的過程內。"
     more_in_less: "以最少的時間學習最多的知識"
     no_experience: "無需編程經驗"
     easy_monitor: "容易管理學生的進程"
@@ -918,11 +918,11 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     see_the: "詳細資訊請看"
     more_info: "。"
     choose_course: "選擇您的課程："
-    enter_code: "輸入一個解銷碼" # {change}
-    enter_code1: "輸入解銷碼"
+    enter_code: "輸入一個解鎖碼來加入已存在的課堂"
+    enter_code1: "輸入解鎖碼"
     enroll: "註冊"
     pick_from_classes: "從目前的課程選擇"
-    enter: "輪入"
+    enter: "輸入"
     or: "或"
     topics: "題目"
     hours_content: "內容時間："
@@ -1120,7 +1120,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     simulate_games: "模擬遊戲!"
     games_simulated_by: "您模擬過的次數:"
     games_simulated_for: "替您模擬的次數:"
-#    games_in_queue: "Games currently in the queue:"
+    games_in_queue: "遊戲正在列隊中："
     games_simulated: "遊戲已模擬"
     games_played: "玩過的遊戲"
     ratio: "通過率"
@@ -1157,7 +1157,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     fight: "戰鬥!"
     watch_victory: "觀看您的勝利"
     defeat_the: "擊敗"
-#    watch_battle: "Watch the battle"
+    watch_battle: "觀看戰役"
     tournament_started: "，錦標賽已開始"
     tournament_ends: "錦標賽結束"
     tournament_ended: "錦標賽已結束"
@@ -1215,7 +1215,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     no_recent_games: "在過去兩個星期沒有玩過遊戲。"
     payments: "付款"
     prepaid: "充值"
-#    prepaid_codes: "Prepaid Codes"
+    prepaid_codes: "充值碼"
     purchased: "已購買"
     sale: "促銷"
     subscription: "訂閱"
diff --git a/app/views/play/level/tome/Spell.coffee b/app/views/play/level/tome/Spell.coffee
index bfe920e48..57527f9b5 100644
--- a/app/views/play/level/tome/Spell.coffee
+++ b/app/views/play/level/tome/Spell.coffee
@@ -152,7 +152,14 @@ module.exports = class Spell
     skipProtectAPI = @skipProtectAPI or not writable
     problemContext = @createProblemContext thang
     includeFlow = (@levelType in ['hero', 'hero-ladder', 'hero-coop', 'course', 'course-ladder']) and not skipProtectAPI
-    aetherOptions = createAetherOptions functionName: @name, codeLanguage: @language, functionParameters: @parameters, skipProtectAPI: skipProtectAPI, includeFlow: includeFlow, problemContext: problemContext
+    aetherOptions = createAetherOptions
+      functionName: @name
+      codeLanguage: @language
+      functionParameters: @parameters
+      skipProtectAPI: skipProtectAPI
+      includeFlow: includeFlow
+      problemContext: problemContext
+      whileTrueAutoYield: @levelType is 'course'
     aether = new Aether aetherOptions
     if @worker
       workerMessage =
diff --git a/app/views/play/menu/GuideView.coffee b/app/views/play/menu/GuideView.coffee
index 9e3f72fbf..f1c502672 100644
--- a/app/views/play/menu/GuideView.coffee
+++ b/app/views/play/menu/GuideView.coffee
@@ -122,6 +122,7 @@ module.exports = class LevelGuideView extends CocoView
     tag.height = @helpVideoHeight
     tag.width = @helpVideoWidth
     tag.frameborder = '0'
+    tag.allowFullscreen = true
     @$el.find('#help-video-player').replaceWith(tag)
 
     @onMessageReceived = (e) =>
diff --git a/package.json b/package.json
index f9259c5dc..f7ddf0086 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "coffee-script-brunch": "https://github.com/brunch/coffee-script-brunch/tarball/master",
     "coffeelint-brunch": "> 1.0 < 1.8",
     "compressible": "~1.0.1",
-    "commonjs-require-definition": "~0.2.0",
+    "commonjs-require-definition": "0.2.0",
     "css-brunch": "> 1.0 < 1.8",
     "jade": "0.33.x",
     "jade-brunch": "> 1.0 < 1.8",
diff --git a/scripts/mongodb/queries/coursesV1Beta.js b/scripts/mongodb/queries/coursesV1Beta.js
index 0f86d7111..25a962e9f 100644
--- a/scripts/mongodb/queries/coursesV1Beta.js
+++ b/scripts/mongodb/queries/coursesV1Beta.js
@@ -17,13 +17,13 @@ function objectIdWithTimestamp(timestamp)
 }
 
 var betaStartDate = new ISODate('2015-10-08');
-var minMembers = 9;
+var minMembers = 2;
 
 var classes = [];
 var ownerIDs = [];
 var cursor = db['course.instances'].find({$and: [
     {_id: {$gte: objectIdWithTimestamp(betaStartDate)}},
-    {$where: 'this.members.length > ' + minMembers}
+    {$where: 'this.members.length >= ' + minMembers}
 ]}).sort({_id: 1});
 while (cursor.hasNext()) {
     var doc = cursor.next();
@@ -59,7 +59,8 @@ classes.sort(function(a, b) {
 });
 
 for (var i = 0; i < classes.length; i++) {
-  print(classes[i].url + '\t' + classes[i].memberCount + '\t' + classes[i].email + '\t' + classes[i].name);
+  // print(classes[i].url + '\t' + classes[i].memberCount + '\t' + classes[i].email + '\t' + classes[i].name);
+  print(classes[i].email);
 }
 
-print(classes.length + ' course instances with over ' + minMembers + ' members');
+print(classes.length + ' course instances with at least ' + minMembers + ' members');