diff --git a/lib/commands/build.js b/lib/commands/build.js
index cbb6501d7c..551fa5be06 100644
--- a/lib/commands/build.js
+++ b/lib/commands/build.js
@@ -39,10 +39,11 @@ module.exports = async function build(siteDir, cliOptions = {}) {
   const serverConfig = createServerConfig(props).toConfig();
   const clientConfig = createClientConfig(props).toConfig();
 
-  // we build the client bundles first
+  // Build the client bundles first.
+  // We cannot run them in parallel because the server need to pickup the correct client bundle name
   await compile(clientConfig);
 
-  // then we build the server bundles (render the static HTML and pick client bundle)
+  // Build the server bundles (render the static HTML and pick client bundle)
   await compile(serverConfig);
 
   // copy static files
diff --git a/lib/commands/start.js b/lib/commands/start.js
index 5b7a96e831..3d766194d9 100644
--- a/lib/commands/start.js
+++ b/lib/commands/start.js
@@ -95,7 +95,7 @@ module.exports = async function start(siteDir, cliOptions = {}) {
           // enable HTTP range requests
           app.use(range);
 
-          // rewrite request to `/` since this is a SPA
+          // rewrite request to `/` since dev is only a SPA
           app.use(
             convert(
               history({
diff --git a/website/components/Todo/index.js b/website/components/Todo/index.js
index 50e2291d1f..f0da5a519b 100644
--- a/website/components/Todo/index.js
+++ b/website/components/Todo/index.js
@@ -36,7 +36,7 @@ const todos = [
   },
   {
     id: '63a871b2-0b6f-4422-9c35-304bc680a4b7',
-    title: 'Earn money through open source work.',
+    title: 'Contribute to open source.',
     completed: false
   },
   {
diff --git a/website/pages/youtube.js b/website/pages/youtube.js
index b2c92c60e8..04a7709620 100644
--- a/website/pages/youtube.js
+++ b/website/pages/youtube.js
@@ -19,7 +19,8 @@ export default class Player extends React.Component {
           <title>My Youtube</title>
         </Helmet>
         <p align="center">
-          <YouTube videoId="d9IxdwEFk1c" opts={opts} onReady={this._onReady} />
+        {/* this is a React-youtube component */  }
+        <YouTube videoId="d9IxdwEFk1c" opts={opts} onReady={this._onReady} />
         </p>
       </Layout>
     );