diff --git a/main.html b/main.html
index 2e1c0ff3cd..dacab60abb 100644
--- a/main.html
+++ b/main.html
@@ -73,8 +73,17 @@
       <input id="calculator_button" type=button value="=&gt;">
       <input type="text" id="calculator_output" readonly>
 
-      <p>Supported suffixes: %kMGTcmunp</p>
-      <p>Supported operations: ^ * / + - ()</p>
+<table>      <tr><td align="right">Suffixes</td><td>&nbsp;:&nbsp;</td><td align="left"> %kMGTcmunp</td></tr>
+      <tr><td align="right">Operations</td><td>&nbsp;:&nbsp;</td><td align="left"> ^ * / + - ()</td></tr>
+      <tr><td align="right">Functions</td><td>&nbsp;:&nbsp;</td><td align="left"> sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </td></tr>
+      <tr><td align="right">Constants</td><td>&nbsp;:&nbsp;</td><td align="left"> e</td></tr>
+      <!--p> Unsupported: ||, j </p
+Students won't know what parallel means at this time. 
+Complex numbers aren't well tested in the courseware, so we would prefer to not expose them. 
+If you read the comments in the source, feel free to use them. If you run into a bug, please 
+let us know. But we can't officially support them right now. 
+--> 
+</table>
     </div>
 
 <script>
diff --git a/privacy.html b/privacy.html
index dda3f33aef..68dbcde54a 100644
--- a/privacy.html
+++ b/privacy.html
@@ -2,6 +2,188 @@
 
 <section class="privacy-policy">
   <div>
-    <h1> Privacy Policy </h1>
+<h1>Privacy Policy</h1>
+
+<h2>Confidentiality &amp; Security of Personally
+Identifiable Information</h2>
+
+<p>We care about the confidentiality and security of your personal
+information. We will use commercially reasonable efforts to keep your
+Personally Identifiable Information private and will not share it with third
+parties, except as set forth in this Privacy Policy. However, no method of
+transmitting or storing electronic data is ever completely secure, and we
+cannot guarantee that such information will never be accessed, used, or
+released in a manner that is inconsistent with this policy. </p>
+
+<p>This Privacy Policy only applies to information that we collect
+through the Site and does not apply to information that we may collect
+from you in other ways (for example, this policy does not apply to
+information that you may provide to us over the phone, by fax or
+through conventional mail). In addition, please note that this policy
+does not apply to your educational records -- those records are protected
+by the Family Educational Rights and Privacy Act (&quot;FERPA&quot;)
+with which we are committed to comply.</p>
+
+<h2>Usernames and Postings </h2>
+
+<p>Comments or other information posted by you to our forums,
+wikis, or other areas of the Site designed for public communications may be
+viewed and downloaded by others who visit the Site. For this reason, we
+encourage you to use an anonymous username, and to not post any personally
+identifiable information to those forums (or other public areas).</p>
+
+<h2>What You Consent to by Using Our Site</h2>
+
+<p>Please understand that by submitting any Personally Identifiable
+Information to us, you consent and agree that we may collect, use and
+disclose such Personally Identifiable Information in accordance with
+this Privacy Policy and our TOS, and as permitted or required by
+law. If you do not agree with these terms, then please do not provide
+any Personally Identifiable Information to us. As used herein,
+&quot;Personally Identifiable Information&quot; means your full name,
+email address and your student identification number. If you refuse,
+or if you choose not to provide us with any required Personally
+Identifiable Information, we may not be able to provide you with the
+services that can be offered on our Site.</p>
+
+<h2>What Information We Collect </h2>
+
+<p>We collect information, including Personally Identifiable
+Information, when you sign up for a User Account, participate in
+online courses, send us email messages and/or participate in our
+public forums. We collect information about student performance and
+patterns of learning. We track information indicating, among other
+things, which pages of our Site were visited, the order in which they
+were visited, when they were visited, and which hyperlinks and other
+user interface controls were used.</p>
+
+<p>We may log the IP address, operating system and browser software
+used by each user of the Site, and we may be able to determine from an
+IP address a user's Internet Service Provider and the geographic
+location of his or her point of connectivity. Various web analysis
+tools are used to collect this information. Some of the information is
+collected through cookies (a small text file placed on your
+computer). You should be able to control how and whether cookies will
+be accepted by your web browser. Most browsers offer instructions on
+how to reset the browser to reject cookies in the &quot;Help&quot;
+section of the toolbar. If you reject our cookies, many functions and
+conveniences of this Site may not work properly.</p>
+
+<p>Among other things, we may use the information that you provide
+(including your Personally Identifiable Information) in connection
+with the following:</p>
+
+<ul>
+ <li>To help us improve <i>MITx</i> offerings, both individually
+     (e.g. by course staff when working with a student) and in
+     aggregate, and to individualize the experience and to evaluate
+     the access and use of the Site and the impact of <i>MITx</i> on
+     the worldwide educational community.
+     </li>
+ <li>For purposes of scientific research, particularly, for
+     example, in the areas of cognitive science and education. </li>
+ <li>For the purpose for which you specifically provided
+     the personal information, for example to respond to a specific inquiry or
+     provide you the specific course and/or services you select. </li>
+ <li>To track both individual and aggregate attendance,
+     progress and completion of an online course, and to analyze statistics on
+     student performance and how students learn. </li>
+ <li>To monitor and detect violations of the Honor Code, the
+     Terms of Service, as well as other misuses and potential misuses of the
+     site. </li>
+ <li>To publish information gathered about <i>MITx</i>
+     access, use, impact, and student performance but only as non-personally
+     identifiable data.</li>
+ <li>To send you updates about online courses offered by <i>MITx</i>
+     or other MIT events or to send you email messages about Site maintenance
+     or updates.</li>
+ <li>To archive this information and/or use it for future
+     communications with you.</li>
+ <li>As otherwise described to you at the point of
+     collection. </li>
+</ul>
+
+<h2>Sharing with Third Parties</h2>
+
+<p>We may share the information we collect with third parties
+as follows:</p>
+
+<ul>
+<li> With service providers or
+contractors that perform certain functions on our behalf, including processing
+information that you provide to us on the Site, operating the Site or portions
+of it, or in connection with other aspects of <i>MITx</i> services. These
+service providers and contractors will be obligated to keep your information
+confidential.</p>
+
+<li> With all users and other visitors
+to the Site, to the extent that you submit post comments or other information
+to a portion of the Site designed for public communications. As provided in the
+Terms of Service, we may provide those postings to students in future offerings
+of the course, either within the context of the forums, the courseware, or
+otherwise, for marketing purposes, or in any other way. If we do use your postings,
+we will use them without your real name and e-mail (except with explicit
+permission), but we may use your username. </p>
+
+<li>To connect you to other users of the web site. For instance, we
+may recommend study partners, or mentors/mentees. In such cases, we
+may use all information collected to determine who to connect you to,
+but we will only connect you by username, and not by real name or
+e-mail address. </p>
+
+<li> To respond to subpoenas, court orders, or other legal process, in
+response to a request for cooperation from law enforcement or another
+government agency, to investigate, prevent, or take action regarding
+illegal activities, suspected fraud, or to enforce our user agreement
+or privacy policy, or to protect our rights or the rights of
+others.</p>
+
+<li> As otherwise described to you at the point of collection or
+pursuant to your consent. For example, from time to time, we may ask
+your permission to use your Personally Identifiable Information in
+other ways. In the future, <i>MITx</i> may have an alumni association,
+resume book, etc. We may offer services where it is possible to
+verify <i>MITx</i> credentials. </p>
+
+<li> For integration with third party services. Videos and other
+content may be hosted on YouTube and other web sites not controlled
+by <i>MITx</i>. We may provide links and other integration with social
+networks, and other sites. Those web sites are guided by their own
+privacy policies. </p>
+</ul>
+
+<h2>Personalization and Pedagogical Improvements</h2>
+
+<p>Our goal is to provide current and future visitors with the best
+possible educational experience. To further this goal, we sometimes
+present different users with different versions of course materials
+and software. We do this to personalize the experience to the
+individual learner (assess the learner's level of ability and learning
+style, and present materials best suited to the learner), to evaluate
+the effectiveness of our course materials, to improve our
+understanding of the learning process, and to otherwise improve the
+effectiveness of our offerings. We may publish or otherwise publicize
+results from this process, but only as non-personally-identifiable
+data. </p>
+
+<h2>Changing Our Privacy Policy</h2>
+
+<p>Please note that we review our privacy practices from time to time,
+and that these practices are subject to change. Any change, update, or
+modification will be effective immediately upon posting on our
+Site. We will notify you of any material change to this Privacy Policy
+by posting a notice on our Site's homepage for a reasonable period of
+time following such update, and by changing the effective date
+(located at the bottom of this page). Be sure to return to this page
+periodically to ensure familiarity with the most current version of
+this Privacy Policy. </p>
+
+<h2>Privacy Concerns</h2>
+
+<p>If you have privacy concerns, or have disclosed data you would
+prefer to keep private, please contact us
+at <a href="mailto:privacy@mitx.mit.edu">privacy@mitx.mit.edu</a>. </p>
+
+
   </div>
 </section>
diff --git a/tos.html b/tos.html
index 9a4d327e87..769102c026 100644
--- a/tos.html
+++ b/tos.html
@@ -3,13 +3,13 @@
 <section class="tos">
   <div>
 
-<h1>MITx Terms of Service</h1>
+<h1><i>MITx</i> Terms of Service</h1>
 
-<p>Welcome to MITx. You must read and agree to these Terms of Service
-(&quot;TOS&quot;), MITx&rsquo;s <a href="/t/privacy.html">Privacy
+<p>Welcome to <i>MITx</i>. You must read and agree to these Terms of Service
+(&quot;TOS&quot;), <i>MITx</i>&rsquo;s <a href="/t/privacy.html">Privacy
 Policy</a>, and <a href="/t/honor.html">Honor Code</a> prior to
 registering for this Site or using any portion of this site
-(&ldquo;Site&rdquo;) , including accessing any course materials, chat
+(&ldquo;Site&rdquo;), including accessing any course materials, chat
 room, mailing list, or other electronic service. These TOS, the
 Privacy Policy and the Honor Code are agreements (the
 &ldquo;Agreements&rdquo;) between you and the Massachusetts Institute
@@ -17,7 +17,7 @@ of Technology (&ldquo;MIT&rdquo;). If you do not understand or do not
 agree to be bound by the terms of the Agreements, please immediately
 exit this site. </p>
 
-<p>MITx reserves the right to modify these TOS at any time and will
+<p><i>MITx</i> reserves the right to modify these TOS at any time and will
 publish notice of any such modifications online on the
 Site <a href="/t/tos.html">Terms of Service page</a> for a reasonable
 period of time following such modifications, and by changing the
@@ -25,13 +25,12 @@ effective date of these TOS. By continuing to access the Site
 after notice of such modifications has been published, you signify
 your agreement to be bound by them. </p>
 
-<h2>Description of MITx </h2>
+<h2>Description of <i>MITx</i> </h2>
 
-<p>MITx offers online courses, professor-to-student and
-student-to-student interactivity, individual assessment of a
-student&rsquo;s work, and the opportunity for students who demonstrate
-their mastery of subjects to earn a certificate or credential awarded
-by MITx. </p>
+<p><i>MITx</i> offers online courses that include opportunities for
+professor-to-student and student-to-student interactivity, individual
+assessment of a student's work, and for students who demonstrate their
+mastery of subjects, a certificate or credential. </p>
 
 <h2>Rules for Online Conduct</h2>
 
@@ -39,32 +38,34 @@ by MITx. </p>
 for your User Postings.  &ldquo;User Postings&rdquo; include all
 content submitted, posted, published or distributed on the Site by you
 or other users of the Site, including but not limited to all forum
-posts, notes, questions, and comments. You agree that you will use the
-Site in compliance with these TOS and all applicable local, state,
-national, and international laws, rules and regulations, including any
-laws regarding the transmission of technical data exported from your
-country of residence and all United States export control laws.
+posts, wiki edits, notes, questions, comments, videos, and file
+uploads. You agree that you will use the Site in compliance with these
+TOS, the <a href="/t/honor.html">Honor Code</a>, and all applicable
+local, state, national, and international laws, rules and regulations,
+including copyright laws and any laws regarding the transmission of
+technical data exported from your country of residence and all United
+States export control laws.
 
 <p>As a condition of your use of the Services, you will not use the
-Site in any manner that could damage, disable, overburden, or impair
-any MITx server, or the network(s) connected to any MITx server, or
-interfere with any other party&#39;s use and enjoyment of the
+Site in any manner intended to damage, disable, overburden, or impair
+any <i>MITx</i> server, or the network(s) connected to any <i>MITx</i>
+server, or interfere with any other party's use and enjoyment of the
 Site. You may not attempt to gain unauthorized access to the Site,
-other accounts, computer systems or networks connected to any MITx
-server through hacking, password mining or any other means. You may
-not obtain or attempt to obtain any materials or information through
-any means not intentionally made available through the Site. </p>
+other accounts, computer systems or networks connected to
+any <i>MITx</i> server through hacking, password mining or any other
+means. You may not obtain or attempt to obtain any materials or
+information stored on the Site, its servers, or associated computers
+through any means not intentionally made available through the
+Site. </p>
 
 <h2>The following list of items is strictly prohibited on the Site:</h2>
 <ol>
-<li>Content that defames or threatens others
-<li>Harassing statements or content 
+<li>Content that defames, harasses, or threatens others
 <li>Content that discusses illegal activities with the intent to commit them.
 <li>Content that infringes another&#39;s intellectual property,
-including, but not limited to, copyrights, trademarks, or trade
-secrets
-<li>Any inappropriate, profane, pornographic, defamatory, obscene,
-indecent, or unlawful content
+including, but not limited to, copyrights, or trademarks
+<li>Any inappropriate, profane, pornographic, obscene, indecent, or
+unlawful content
 <li>Advertising or any form of commercial solicitation
 <li>Political content or content related to partisan political
 activities
@@ -100,7 +101,7 @@ information to keep it accurate and current. </p>
 <p>We consider the confidentiality and security of your information to
 be of the utmost importance.  Please see
 our <a href="/t/privacy.html">Privacy Policy</a> for more information
-about what information about you MITx collects and how MITx uses that
+about what information about you <i>MITx</i> collects and how <i>MITx</i> uses that
 information.</p>
 
 <h2>Your Right to Use Content on the Site</h2>
@@ -109,7 +110,7 @@ information.</p>
 Site is protected by United States copyright. The texts, exams and
 other instructional materials provided with the courses offered on
 this Site are for your personal use in connection with those courses
-only. MIT is planning to make MITx course content and software
+only. MIT is planning to make <i>MITx</i> course content and software
 infrastructure available under open source licenses that will help
 create a vibrant ecosystem of contributors and further MIT&rsquo;s
 goal of making education accessible and affordable to the world. </p>
@@ -118,40 +119,41 @@ goal of making education accessible and affordable to the world. </p>
 information on the Site are used with the permission of third parties
 and use of that information is subject to certain rules and
 conditions, which will be posted along with the information. By using
-this Site you agree to abide by all such terms and conditions. Due to
-privacy concerns, student-created content, including all forum posts,
-is all Rights Reserved until released under other terms by MITx. </p>
+this Site you agree to abide by all such rules and conditions. Due to
+privacy concerns, User Postings shall be licensed to <i>MITx</i> with
+the terms discussed below. </p>
 
-<h2>USER POSTINGS</h2>
+<h2>User Postings</h2>
 
 <p><strong>User Postings Representations and Warranties.</strong> By
-uploading and publishing your User Postings, you affirm, represent,
-and warrant that you are the creator and owner of or have the
-necessary licenses, rights, consents, and permissions to use and to
-authorize MIT and MITx&rsquo;s Users to use and distribute your User
-Postings as necessary to exercise the licenses granted by you in these
-TOS and in the manner contemplated by MITx. You, and not MITx, are
-solely responsible for your User Postings and the consequences of
-posting or publishing them.</p>
+creating your User Postings, you affirm, represent, and warrant that
+you are the creator and owner of or have the necessary licenses,
+rights, consents, and permissions to reproduce and publish the posted
+information, and to authorize MIT and <i>MITx</i>'s Users to
+reproduce, modify, publish, and otherwise use that infomation and
+distribute your User Postings as necessary to exercise the licenses
+granted by you below. You, and not <i>MITx</i>, are solely responsible
+for your User Postings and the consequences of posting or publishing
+them.</p>
 
-<p><strong>Limited License Grant to MIT.</strong> By submitting or distributing
-User Postings through the Site, you hereby grant to MIT a worldwide,
-non-exclusive, transferable, assignable, fully paid-up, royalty-free,
-perpetual, irrevocable right and license to host, transfer, display,
-perform, reproduce, modify, distribute and re-distribute, relicense,
-and otherwise exploit your User Postings, in whole or in part, in any
-form, and in any media formats and through any media channels (now
-known or hereafter developed).</p>
+<p><strong>Limited License Grant to MIT.</strong> By submitting or
+distributing User Postings to the Site, you hereby grant to MIT a
+worldwide, non-exclusive, transferable, assignable, fully paid-up,
+royalty-free, perpetual, irrevocable right and license to host,
+transfer, display, perform, reproduce, modify, distribute and
+re-distribute, relicense, and otherwise exploit your User Postings, in
+whole or in part, in any form, and in any media formats and through
+any media channels (now known or hereafter developed).</p>
 
-<p><strong>Limited License Grant to MITx Users.</strong> By submitting
-or distributing User Postings through the Site, you hereby grant to
-each User of the Site a non-exclusive license to access and use your
-User Postings in connection with their use of the Site for their own
-personal purposes. </p>
+<p><strong>Limited License Grant to <i>MITx</i> Users.</strong> By
+submitting or distributing User Postings to the Site, you hereby grant
+to each User of the Site a non-exclusive license to access and use
+your User Postings in connection with their use of the Site for their
+own personal purposes. </p>
 
-<h2>Use of MITx and MIT Names, Trademarks and Service Marks</h2>
+<h2>Use of <i>MITx</i> and MIT Names, Trademarks and Service Marks</h2>
 
-<p>&ldquo;MITx,&rdquo; &quot;MIT&quot;, &quot;Massachusetts Institute
+<p>&ldquo;<i>MITx</i>,&rdquo; &quot;MIT&quot;, &quot;Massachusetts Institute
 of Technology&quot;, and its logos and seal are trademarks of the
 Massachusetts Institute of Technology. You may not use MIT&rsquo;s
 names or logos, or any variations thereof, without prior written
@@ -181,16 +183,13 @@ incorporated herein by reference.</p>
 
 <h2>Disclaimer of Warranty / Indemnification/Limitation of Liabilities</h2>
 
-<p>THE SITE, INCLUDING, WITHOUT LIMITATION, ALL SERVICES, CONTENT,
-FUNCTIONS AND MATERIALS PROVIDED ON OR THROUGH THE SITE AND ANY
-INFORMATION THEREIN ARE PROVIDED &quot;AS IS&quot; WITHOUT WARRANTY OF
-ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR USE FOR A
-PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT AND MIT HEREBY DISCLAIMS
-ANY AND ALL SUCH WARRANTIES, EXPRESS OR IMPLIED. MIT does not warrant
-the Site will operate in an uninterrupted or error-free manner or that
-the Site is free of viruses or other harmful components. Use of
-information obtained from or through this Site is at your own
+<p>THE SITE IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot;
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
+WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR USE FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. MIT does not
+warrant the Site will operate in an uninterrupted or error-free manner
+or that the Site is free of viruses or other harmful components. Use
+of information obtained from or through this Site is at your own
 risk. Your access to or download of information, materials, or data
 through the Site or any reference sites is at your own discretion and
 risk and that you will be solely responsible for any damage to your
@@ -207,8 +206,8 @@ indecent or objectionable, and you agree to waive, and hereby do
 waive, any legal or equitable rights or remedies you have or may have
 against MIT with respect thereto. MIT does not endorse any User
 Postings or any opinion, recommendation or advice expressed
-therein.  MITx has no obligation to monitor any User Postings or
-any other user communications through the Site. However, MITx reserves
+therein.  <i>MITx</i> has no obligation to monitor any User Postings or
+any other user communications through the Site. However, <i>MITx</i> reserves
 the right to review User Postings and to edit or remove, in whole or
 in part, such User Postings in its sole discretion. If notified by a
 User or a content owner of a User Posting that allegedly does not
@@ -220,23 +219,18 @@ reserves the right to do at any time and without notice. </p>
 hyperlinks to sites maintained or controlled by others. MIT is not
 responsible for and does not routinely screen, approve, review or
 endorse the contents of or use of any of the products or services that
-may be offered at these sites. MIT does MIT make any warranty or
-representation regarding any linked third party web sites or the
-information or materials appearing thereon or any of the products or
-services described thereon.  Hyperlinks do not imply that MIT is
-affiliated or associated with, the linked-third party site.  If
-you decide to access linked third party web sites, you do so at your
-own risk.</p>
+may be offered at these sites. If you decide to access linked third
+party web sites, you do so at your own risk.</p>
 
 <strong>
 <p>YOU AGREE THAT MIT WILL NOT BE LIABLE TO YOU FOR ANY LOSS OR
 DAMAGES, EITHER ACTUAL OR CONSEQUENTIAL, ARISING OUT OF OR RELATING TO
-THESETOS, OR TO YOUR (OR ANY THIRD PARTY&#39;S) USE OR INABILITY TO
-USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE SITE, OR TO YOUR
-RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH THE SITE WHETHER
-BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW, EXCEPT ONLY IN THE
-CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO THE EXTENT THAT
-APPLICABLE LAW REQUIRES SUCH LIABILITY. </p>
+THESE TERMS OF SERVICE, OR TO YOUR (OR ANY THIRD PARTY&#39;S) USE OR
+INABILITY TO USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE
+SITE, OR TO YOUR RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH
+THE SITE WHETHER BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW,
+EXCEPT ONLY IN THE CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO
+THE EXTENT THAT APPLICABLE LAW REQUIRES SUCH LIABILITY. </p>
 
 <p>IN PARTICULAR, MIT WILL HAVE NO LIABILTY FOR ANY CONSEQUENTIAL,
 INDIRECT, PUNITIVE, SPECIAL, EXEMPLARY OR INCIDENTAL DAMAGES, WHETHER