diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index f588fcc9a0..2cab1e4100 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -37,7 +37,7 @@
         "La mayoría de los elementos HTML tienen una <code>etiqueta de apertura</code> y una <code>etiqueta de cierre</code>. Las etiquetas de apertura se ven como: <code>&#60;h1&#62;</code>. Las etiquetas de cierre se ven como: <code>&#60;/h1&#62;</code>. Fíjate que la única diferencia entre las etiquetas de apertura y de cierre es que estas últimas tienen un / después de su signo de apertura (<).",
         "Una vez que hayas completado cada desafío, y que hayas pasado todas sus pruebas, el botón \"Ir a mi siguiente desafío\" se activará. Haz click en él - o presiona control y enter al mismo tiempo - para avanzar al siguiente desafío.",
         "Para activar el botón \"Ir a mi siguiente desafío\" de este ejercicio, cambia tu texto de la etiqueta <code>h1</code> para que diga \"Hello World\" en lugar de \"Hello\"."
-	  ],
+      ],
       "namePt": "",
       "descriptionPt": []
     },
@@ -73,7 +73,7 @@
         "El elemento h2 que ingreses creará un elemento h2 en el sitio web.",
         "Este elemento le dice al navegador cómo mostrar el texto que contiene.",
         "Los elementos <code>h2</code> son ligeramente más pequeños que los elementos <code>h1</code>. También hay elementos <code>h3</code>, <code>h4</code>, <code>h5</code> y <code>h6</code>."
-	  ],
+      ],
       "namePt": "",
       "descriptionPt": []
     },
@@ -89,7 +89,7 @@
       "tests": [
         "assert(($('p').length > 0), 'Create a <code>p</code> element.')",
         "assert.isTrue((/hello(\\s)+paragraph/gi).test($('p').text()), 'Your <code>p</code> element should have the text \"Hello Paragraph\".')",
-        "assert(editor.match(/<\\/p>/g) && editor.match(/<\\/p>/g).length === editor.match(/<p>/g).length, 'Make sure your <code>p</code> element has a closing tag.')"
+        "assert(editor.match(/<\\/p>/g) && editor.match(/<\\/p>/g).length === editor.match(/<p/g).length, 'Make sure your <code>p</code> element has a closing tag.')"
       ],
       "challengeSeed": [
         "<h1>Hello World</h1>",
@@ -107,7 +107,7 @@
         "Crea un elemento párrafo debajo de tu elemento h2, y dale el texto \"Hello Paragraph\". Apenas escribas la etiqueta de apertura <code>&#60;p&#62;</code>, una de nuestras pruebas pasarán (ya que ésta es HTML válido). Asegúrate de cerrar el elemento agregando la etiqueta de cierre <code>&#60;/p&#62;</code>.",
         "Los elementos párrafo son los principales elementos para los párrafos de texto en tamaño normal en sitios web.",
         "Tú puedes crear un elemento párrafo como éste: <code>&#60;p&#62;I'm a p tag!&#60;/p&#62;</code>."
-	  ],
+      ],
       "namePt": "",
       "descriptionPt": []
     },
@@ -202,7 +202,8 @@
       "tests": [
         "assert(($('h1').length === 0), 'Comment out your <code>h1</code> element so that it is not visible on your page.')",
         "assert(($('h2').length > 0), 'Leave your <code>h2</code> element uncommented so that is not visible on your page.')",
-        "assert(($('p').length === 0), 'Comment out your <code>p</code> element so that it is not visible on your page.')"
+        "assert(($('p').length === 0), 'Comment out your <code>p</code> element so that it is not visible on your page.')",
+        "assert(editor.match(/-->/g).length > 0, 'Be sure to close each of your comments with <code>--&#62;</code>.')"
       ],
       "challengeSeed": [
         "<!--",
@@ -342,7 +343,7 @@
         "Cambia el estilo del elemento <code>h2</code> de manera que el color de su texto sea rojo.",
         "Podemos hacer esto por medio de cambiar el <code>estilo</code> del elemento <code>h2</code>.",
         "El estilo responsable del color de texto de un elemento es el estilo \"color\".",
-        "Así es como podrías volver el color de texto de tu elemento <code>h2</code> en azul: <code>&#60;h2 style=\"color: blue\"&#62;CatPhotoApp&#60;/h2&#62;</code>"
+        "Así es como podrías volver el color de texto de tu elemento <code>h2</code> en azul: <code>&#60;h2 style=\"color: blue\"&#62;CatPhotoApp&#60;/h2&#62;</code>."
       ],
       "namePt": "",
       "descriptionPt": []
@@ -356,14 +357,14 @@
         "With CSS, there are hundreds of CSS \"attributes\" that you can use to change the way an element looks on your page.",
         "When you entered <code>&#60;h2 style=\"color: red\"&#62;CatPhotoApp&#60;/h2&#62;</code>, you were giving that individual <code>h2</code> element an \"inline style\".",
         "That's one way to add style to an element, but a better way is by using Cascading Style Sheets (CSS).",
-        "At the top of your code, create a <code>style</code> element like this: <code>&#60;style&#62;&#60;/style&#62;</code>",
-        "Inside that style element, you can create a \"CSS selector\" for all <code>h2</code> elements. For example, if you wanted all <code>h2</code> elements to be red, your style element would look like this: <code>&#60;style&#62;h2 {color: red;}&#60;/style&#62;</code>",
+        "At the top of your code, create a <code>style</code> element like this: <code>&#60;style&#62;&#60;/style&#62;</code>.",
+        "Inside that style element, you can create a \"CSS selector\" for all <code>h2</code> elements. For example, if you wanted all <code>h2</code> elements to be red, your style element would look like this: <code>&#60;style&#62;h2 {color: red;}&#60;/style&#62;</code>.",
         "Note that it's important to have both opening and closing curly braces (<code>{</code> and <code>}</code>) around each element's style. You also need to make sure your element's style is between the opening and closing style tags. Finally, be sure to add the semicolon to the end of each of your element's styles."
       ],
       "tests": [
         "assert($('h2').css('color') === 'rgb(0, 0, 255)', 'Your <code>h2</code> element should be blue.')",
         "assert(!$('h2').attr('style'), 'Remove the style attribute from your <code>h2</code> element.')",
-        "assert(($('style').length > 0), 'Create a <code>style</code> element.')",
+        "assert(($('style').length > 1), 'Create a <code>style</code> element.')",
         "assert(editor.match(/<\\/style>/g) && editor.match(/<\\/style>/g).length === editor.match(/<style>/g).length, 'Make sure each of your <code>style</code> elements has a closing tag.')"
       ],
       "challengeSeed": [
@@ -382,10 +383,10 @@
       "descriptionEs": [
         "Borra el atributo <code>style</code> de tu elemento <code>h2</code> y escribe el CSS para hacer todos los elementos <code>h2</code> de color azul.",
         "Con CSS, hay cientos de <code>atributos CSS</code> que puedes usar para cambiar como un elemento se ve en una página web.",
-        "Cuando entraste <code>&#60;h2 style=\"color: red\"&#62;CatPhotoApp&#60;h2&#62;</code>, le estuviste dando a ese elemento h2 en particular un <code>estilo en línea</code>",
+        "Cuando entraste <code>&#60;h2 style=\"color: red\"&#62;CatPhotoApp&#60;h2&#62;</code>, le estuviste dando a ese elemento h2 en particular un <code>estilo en línea</code>.",
         "Esa es una forma de agregar estilo a un elemento, pero una manera mejor es usando <code>Hojas de Estilo en Cascada (Cascading Style Sheets, CSS)</code>.",
-        "Al principio de tu código, crea una <code>etiqueta style</code> como ésta: <code>&#60;style&#62;&#60;/style&#62;</code>",
-        "Dentro de ese elemento style, puedes crear un <code>selector css</code> para todos los elementos <code>h2</code>. Por ejemplo, si querías que todos los elementos <code>h2</code> sean rojos, tu elemento style se vería así: <code>&#60;style&#62;h2 {color: red;}&#60;/style&#62;</code>",
+        "Al principio de tu código, crea una <code>etiqueta style</code> como ésta: <code>&#60;style&#62;&#60;/style&#62;</code>.",
+        "Dentro de ese elemento style, puedes crear un <code>selector css</code> para todos los elementos <code>h2</code>. Por ejemplo, si querías que todos los elementos <code>h2</code> sean rojos, tu elemento style se vería así: <code>&#60;style&#62;h2 {color: red;}&#60;/style&#62;</code>.",
         "Fíjate que es importante tener <code>llaves de apertura y de cierre</code> (<code>{</code> y <code>}</code>) alrededor del estilo para cada elemento. También necesitas asegurarte que el estilo para tu elemento está entre las etiquetas style de apertura y cierre. Finalmente, asegúrate de agregar el punto y coma al final de cada uno de los estilos de tu elemento."
       ],
       "namePt": "",
@@ -401,7 +402,7 @@
         "Here's the anatomy of a CSS class:",
         "<img class='img-responsive' alt='a diagram of how style tags are composed, which is also described in detail on the following lines.' src='https://www.evernote.com/l/AHSCzZV0l_dDLrqD8r9JsHaBWfEzdN0OpRwB/image.png'/>",
         "You can see that we've created a CSS class called \"blue-text\" within the <code>&#60;style&#62;</code> tag.",
-        "You can apply a class to an HTML element like this: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;/h2&#62;</code>",
+        "You can apply a class to an HTML element like this: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;/h2&#62;</code>.",
         "Note that in your CSS <code>style</code> element, classes should start with a period. In your HTML elements' class declarations, classes shouldn't start with a period.",
         "Instead of creating a new <code>style</code> element, try removing the <code>h2</code> style declaration from your existing style element, then replace it with the class declaration for \".red-text\"."
       ],
@@ -482,7 +483,8 @@
       ],
       "tests": [
         "assert($('p').length > 1, 'You need 2 <code>p</code> elements with Kitty Ipsum text.')",
-        "assert(editor.match(/<\\/p>/g).length > 1, 'Make sure each of your <code>p</code> elements has a closing tag.')",
+        "assert(editor.match(/<\\/p>/g) && editor.match(/<\\/p>/g).length === editor.match(/<p/g).length, 'Make sure each of your <code>p</code> elements has a closing tag.')",
+        "assert.isTrue((/Purr\\s+jump\\s+eat/gi).test($('p').text()), 'Your <code>p</code> element should contain the first few words of the provided additional \"Kitty Ipsum\" text.')",
         "assert($('p').css('font-size') === '16px', 'Give your <code>p</code> elements the font-size of 16px.')"
       ],
       "challengeSeed": [
@@ -515,7 +517,7 @@
       "description": [
         "Make all of your <code>p</code> elements use the \"Monospace\" font.",
         "You can set an element's font by using the \"font-family\" attribute.",
-        "For example, if you wanted to set your <code>h2</code> element's font to \"Sans-serif\", you would use the following CSS: <code>h2 { font-family: Sans-serif; }</code>"
+        "For example, if you wanted to set your <code>h2</code> element's font to \"Sans-serif\", you would use the following CSS: <code>h2 { font-family: Sans-serif; }</code>."
       ],
       "tests": [
         "assert($('p').css('font-family').match(/monospace/i), 'Your <code>p</code> elements should use the font \"Monospace\".')"
@@ -556,7 +558,7 @@
         "Apply the <code>font-family</code> of \"Lobster\" to your <code>h2</code> element.",
         "First, you'll need to make a \"call\" to Google to grab the \"Lobster\" font and load it into your HTML.",
         "Copy the following code snippet and paste it into your code editor above your <code>style</code> element:",
-        "<code>&#60;link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'&#62;</code>",
+        "<code>&#60;link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'&#62;</code>.",
         "Now you can set \"Lobster\" as a font-family attribute on your <code>h2</code> element."
       ],
       "tests": [
@@ -600,8 +602,8 @@
       "description": [
         "Make all your <code>h2</code> elements use \"Lobster\" as their font family, but degrade to the \"Monospace\" font when the \"Lobster\" font isn't available.",
         "You can leave \"Lobster\" your <code>h2</code> element's font-family, and have it \"degrade\" to a different font when \"Lobster\" isn't available.",
-        "For example, if you wanted an element to use the \"Helvetica\" font, but also degrade to the \"Sans-Serif\" font when \"Helvetica\" wasn't available, you could do use this CSS style: <code>p { font-family: \"Helvetica\", \"Sans-Serif\"; }</code>.",
-        "There are several default fonts that are available in all browsers. These include \"Monospace\", \"Serif\" and \"Sans-Serif\". See if you can set your h2 elements to use \"Lobster\" and degrade to \"Monospace\".",
+        "For example, if you wanted an element to use the \"Helvetica\" font, but also degrade to the \"Sans-Serif\" font when \"Helvetica\" wasn't available, you could do use this CSS style: <code>p { font-family: Helvetica, Sans-Serif; }</code>.",
+        "There are several default fonts that are available in all browsers. These include \"Monospace\", \"Serif\" and \"Sans-Serif\". See if you can set your <code>h2</code> elements to use \"Lobster\" and degrade to \"Monospace\".",
         "Now try commenting out your call to Google Fonts, so that the \"Lobster\" font isn't available. Notice how it degrades to the \"Monospace\" font."
       ],
       "tests": [
@@ -652,9 +654,9 @@
         "Sometimes HTML elements will receive conflicting information from CSS classes as to how they should be styled.",
         "If there's a conflict in the CSS, the browser will use whichever style declaration is closest to the bottom of the CSS document (whichever declaration comes last). Note that in-line style declarations are the final authority in how an HTML element will be rendered.",
         "There's one way to ensure that an element is rendered with a certain style, regardless of where that declaration is located. That one way is to use <code>!important</code>.",
-        "In case you're curious, this is the priority hierarchy for element styles: !important > inline style > css class selector > css selector. That is, !important trumps all other styles, and inline styles trump style tag declarations.",
+        "In case you're curious, this is the priority hierarchy for element styles: <code>!important</code> beats inline styles, which beats CSS class selectors, which beats CSS selector. That is, <code>!important</code> trumps all other styles, and inline styles trump style tag declarations.",
         "Here's an example of a CSS style that uses <code>!important</code>: <code>&#60;style&#62; .urgently-blue { color: blue !important; } &#60;/style&#62;</code>.",
-        "Now see if you can make sure the h2 element is rendered in the color red without removing the \"blue-text\" class, doing an in-line styling, or changing the sequence of CSS class declarations."
+        "Now see if you can make sure the <code>h2</code> element is rendered in the color red without removing the \"blue-text\" class, doing an in-line styling, and without changing the sequence of CSS class declarations."
       ],
       "tests": [
         "assert(new RegExp('.blue-text', 'gi').test(editor), 'Create the CSS class \"blue-text\"')",
@@ -709,8 +711,8 @@
         "Try it with this image: <code>http://bit.ly/fcc-kittens</code>."
       ],
       "tests": [
-        "assert($('img').length > 0, 'Your webpage should have an image element.')",
-        "assert(!!$('img').filter(function(index) { return /kittens/gi.test($('img').attr('src')); }).length > 0, 'Your image should have have a <code>src</code> attribute that points to the kitten image.')"
+        "assert($('img').length > 0, 'Your page should have an image element.')",
+        "assert($('img').filter(function(index) { return /http:\\/\\/bit\\.ly\\/fcc-kittens/gi.test($('img').attr('src')); }).length > 0, 'Your image should have have a <code>src</code> attribute that points to the kitten image.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -752,7 +754,7 @@
       "difficulty": 0.027,
       "description": [
         "Create a class called <code>smaller-image</code> and use it to resize the image so that it's only 100 pixels wide.",
-        "CSS has an attribute called <code>width</code> that controls an element's width. Just like with fonts, we'll use pixels(px) to specify the images width.",
+        "CSS has an attribute called <code>width</code> that controls an element's width. Just like with fonts, we'll use pixels(px) to specify the image's width.",
         "For example, if we wanted to create a CSS class called \"larger-image\" that gave HTML elements a width of 500 pixels, we'd use: <code>&#60;style&#62; .larger-image { width: 500px; } &#60;/style&#62;</code>."
       ],
       "tests": [
@@ -855,7 +857,7 @@
       "name": "Waypoint: Add Rounded Corners with a Border Radius",
       "difficulty": 0.029,
       "description": [
-        "Give your cat photo a border radius of 10 pixels.",
+        "Give your cat photo a <code>border-radius</code> of 10 pixels.",
         "Your cat photo currently has sharp corners. We can round out those corners with a CSS attribute called <code>border-radius</code>.",
         "You can specify a <code>border-radius</code> with pixels. This will affect how rounded the corners are. Add this attribute to your <code>thick-green-border</code> class and set it to 10 pixels."
       ],
@@ -972,14 +974,15 @@
       "name": "Waypoint: Link to External Pages with Anchor Elements",
       "difficulty": 0.031,
       "description": [
-        "Create an <code>anchor</code> element that links to http://catphotoapp.com and has \"cat photos\" as its anchor text (link text).",
-        "Here's a diagram of an <code>anchor tag</code>. In this case, it's used in the middle of a paragraph element, which means your link will appear in the middle of your sentence.",
+        "Create an <code>a</code> element, or \"anchor element\", that links to http://catphotoapp.com and has \"cat photos\" as its link text, or \"anchor text\".",
+        "Here's a diagram of an <code>a</code> element. In this case, it's used in the middle of a paragraph element, which means your link will appear in the middle of your sentence.",
         "<img class='img-responsive' alt='a diagram of how anchor tags are composed with the same text as on the following line' src='https://www.evernote.com/l/AHSaNaepx_lG9LhhPkVYmagcedpmAeITDsQB/image.png'/>",
-        "Here's an example: <code>&#60;p&#62;Here's a &#60;a href='http://freecodecamp.com'&#62; link to Free Code Camp&#60;/a&#62; for you to follow.&#60;/p&#62;</code>"
+        "Here's an example: <code>&#60;p&#62;Here's a &#60;a href='http://freecodecamp.com'&#62; link to Free Code Camp&#60;/a&#62; for you to follow.&#60;/p&#62;</code>."
       ],
       "tests": [
-        "assert((/cat photos/gi).test($('a').text()), 'Your <code>anchor</code> element should have the anchor text of \"cat photos\"')",
-        "assert($('a').filter(function(index) { return /com/gi.test($('a').attr('href')); }).length > 0, 'You need an <code>anchor</code> element that links to <code>http&#58;//catphotoapp.com<code>.')"
+        "assert((/cat photos/gi).test($('a').text()), 'Your <code>a</code> element should have the anchor text of \"cat photos\"')",
+        "assert($('a').filter(function(index) { return /com/gi.test($('a').attr('href')); }).length > 0, 'You need an <code>a</code> element that links to <code>http&#58;//catphotoapp.com<code>.')",
+        "assert(editor.match(/<\\/a>/g) && editor.match(/<\\/a>/g).length === editor.match(/<a/g).length, 'Make sure your <code>a</code> element has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1033,17 +1036,18 @@
       "name": "Waypoint: Wrap an Anchor Element within a Paragraph",
       "difficulty": 0.032,
       "description": [
-        "Now wrap your anchor element within a <code>p</code> element so that the surrounding paragraph says \"click here for cat photos\", but where only \"cat photos\" is a link - the rest is plain text.",
+        "Now wrap your <code>a</code> element within a <code>p</code> element so that the surrounding paragraph says \"click here for cat photos\", but where only \"cat photos\" is a link - the rest is plain text.",
         "Again, here's a diagram of an <code>a</code> element for your reference:",
         "<img class='img-responsive' alt='a diagram of how anchor tags are composed with the same text as on the following line' src='https://www.evernote.com/l/AHSaNaepx_lG9LhhPkVYmagcedpmAeITDsQB/image.png'/>",
-        "Here's an example: <code>&#60;p&#62;Here's a &#60;a href='http://freecodecamp.com'&#62; link to Free Code Camp&#60;/a&#62; for you to follow.&#60;/p&#62;</code>"
+        "Here's an example: <code>&#60;p&#62;Here's a &#60;a href='http://freecodecamp.com'&#62; link to Free Code Camp&#60;/a&#62; for you to follow.&#60;/p&#62;</code>."
       ],
       "tests": [
         "assert($('a').attr('href').match(/catphotoapp.com/gi).length > 0, 'You need an <code>a</code> element that links to \"catphotoapp.com\".')",
         "assert($('a').text().match(/cat\\sphotos/gi).length > 0, 'Your <code>a</code> element should have the anchor text of \"cat photos\"')",
-        "assert($('a[href=\\'http://www.catphotoapp.com\\']').parent().is('p'), 'Your anchor element should be wrapped within a paragraph element.')",
+        "assert($('a[href=\\'http://www.catphotoapp.com\\']').parent().is('p'), 'Your <code>a</code> element should be wrapped within a paragraph element.')",
         "assert($('p').text().match(/click\\shere\\sfor/gi), 'Your <code>p</code> element should have the text \"click here for\".')",
-        "assert(editor.match(/<\\/p>/g).length > 2, 'Make sure each of your <code>p</code> elements has a closing tag.')"
+        "assert(editor.match(/<\\/p>/g) && editor.match(/<p/g) && editor.match(/<\\/p>/g).length === editor.match(/<p/g).length, 'Make sure each of your <code>p</code> elements has a closing tag.')",
+        "assert(editor.match(/<\\/a>/g) && editor.match(/<a/g) && editor.match(/<\\/a>/g).length === editor.match(/<a/g).length, 'Make sure each of your <code>a</code> elements has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1099,10 +1103,10 @@
       "name": "Waypoint: Make Dead Links using the Hash Symbol",
       "difficulty": 0.033,
       "description": [
-        "Use the hash symbol(#) to turn your <code>anchor</code> element's link into a dead link.",
-        "Sometimes you want to add <code>anchor</code> elements to your website before you know where they will link.",
+        "Use the hash symbol (#) to turn your <code>a</code> element's link into a dead link.",
+        "Sometimes you want to add <code>a</code> elements to your website before you know where they will link.",
         "This is also handy when you're changing the behavior of a link using <code>jQuery</code>, which we'll learn about later.",
-        "Replace your <code>anchor</code> element's <code>href</code> attribute with a hash symbol to turn it into a dead link."
+        "Replace your <code>a</code> element's <code>href</code> attribute with a hash symbol to turn it into a dead link."
       ],
       "tests": [
         "assert($('a').attr('href') === '#', 'Your <code>anchor</code> element should be a dead link with a <code>href</code> attribute set to \"#\".')"
@@ -1161,16 +1165,16 @@
       "name": "Waypoint: Turn an Image into a Link",
       "difficulty": 0.034,
       "description": [
-        "Wrap your <code>img</code> element inside an anchor element with a dead link.",
-        "You can make elements into links by wrapping them in an <code>anchor tag</code>.",
-        "Wrap your image in an <code>anchor tag</code>. Here's an example: <code>&#60;a href='#'&#62;&#60;img src='http://bit.ly/fcc-kittens2'/&#62;&#60;/a&#62;</code>",
-        "Remember to use the hash symbol as your <code>anchor tag</code>'s <code>href</code> property in order to turn it into a dead link.",
+        "Wrap your <code>img</code> element inside an <code>a</code> element with a dead link.",
+        "You can make elements into links by wrapping them within an <code>a</code> element.",
+        "Wrap your image within an <code>a</code> element. Here's an example: <code>&#60;a href='#'&#62;&#60;img src='http://bit.ly/fcc-kittens2'/&#62;&#60;/a&#62;</code>.",
+        "Remember to use the hash symbol (#) as your <code>a</code> element's <code>href</code> property in order to turn it into a dead link.",
         "Once you've done this, hover over your image with your cursor. Your cursor's normal pointer should become the link clicking pointer. The photo is now a link."
       ],
       "tests": [
-        "assert(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Your <code>anchor</code> element should be a dead link with a <code>href</code> attribute set to \"#\".')",
-        "assert($('a').children('img').length > 0, 'Wrap your image element inside an anchor element.')",
-        "assert(editor.match(/<\\/a>/g).length > 1, 'Make sure each of your <code>a</code> elements has a closing tag.')"
+        "assert(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Your <code>a</code> element should be a dead link with a <code>href</code> attribute set to \"#\".')",
+        "assert($('a').children('img').length > 0, 'Wrap your image element within an <code>a</code> element.')",
+        "assert(editor.match(/<\\/a>/g) && editor.match(/<a/g) && editor.match(/<\\/a>/g).length === editor.match(/<a/g).length, 'Make sure each of your <code>a</code> elements has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1226,11 +1230,11 @@
       "name": "Waypoint: Add Alt Text to an Image for Accessibility",
       "difficulty": 0.035,
       "description": [
-        "Add the <code>alt text</code> \"A cute orange cat lying on its back\" to our cat photo",
-        "<code>alt text</code> is what browsers will display if they fail to load the image. <code>alt text</code> is also important for blind or visually impaired users to understand what an image portrays. Search engines also look at <code>alt text</code>.",
-        "In short, every image should have <code>alt text</code>!",
-        "<code>Alt text</code> is a useful way to tell people (and web crawlers like Google) what is pictured in a photo. It's extremely important for helping blind or visually impaired people understand the content of your website.",
-        "You can add alt text right in the img element like this: <code>&#60img src=\"www.your-image-source.com/your-image.jpg\" alt=\"your alt text\"/&#62</code>."
+        "Add an <code>alt</code> attribute with the text \"A cute orange cat lying on its back\" to our cat photo.",
+        "<code>alt</code> attributes, also known as \"alt text\", are what browsers will display if they fail to load the image. <code>alt</code> attributes are also important for blind or visually impaired users to understand what an image portrays. Search engines also look at <code>alt</code> attributes.",
+        "In short, every image should have an <code>alt</code> attribute!",
+        "<code>alt</code> attributes are a useful way to tell people (and web crawlers like Google) what is pictured in a photo. It's extremely important for helping blind or visually impaired people understand the content of your website.",
+        "You can add an <code>alt</code> attribute right in the img element like this: <code>&#60img src=\"www.your-image-source.com/your-image.jpg\" alt=\"your alt text\"/&#62</code>."
       ],
       "tests": [
         "assert($('img').filter(function(){ return /cat/gi.test(this.alt) }).length > 0, 'Your image element should have an <code>alt</code> attribute set to \"A cute orange cat lying on its back\".')"
@@ -1289,7 +1293,7 @@
       "name": "Waypoint: Create a Bulleted Unordered List",
       "difficulty": 0.036,
       "description": [
-        "Replace the paragraph elements with an unordered list of three things that cats love.",
+        "Replace your <code>p</code> elements with an unordered list of three things that cats love.",
         "HTML has a special element for creating unordered lists, or bullet point-style lists.",
         "Unordered lists start with a <code>&#60;ul&#62;</code> element. Then they contain some number of <code>&#60;li&#62;</code> elements.",
         "For example: <code>&#60;ul&#62;&#60;li&#62;milk&#60;/li&#62;&#60;li&#62;cheese&#60;/li&#62;&#60;/ul&#62;</code> would create a bulleted list of \"milk\" and \"cheese\"."
@@ -1297,8 +1301,8 @@
       "tests": [
         "assert($('ul').length > 0, 'Create a <code>ul</code> element.')",
         "assert($('li').length > 2, 'Add three <code>li</code> elements to your <code>ul</code> element.')",
-        "assert(editor.match(/<\\/ul>/g), 'Make sure your <code>ul</code> element has a closing tag.')",
-        "assert(editor.match(/<\\/li>/g) && editor.match(/<\\/li>/g).length > 2, 'Make sure each of your <code>li</code> elements has a closing tag.')"
+        "assert(editor.match(/<\\/ul>/g) && editor.match(/<\\/ul>/g).length === editor.match(/<ul>/g).length, 'Make sure your <code>ul</code> element has a closing tag.')",
+        "assert(editor.match(/<\\/li>/g) && editor.match(/<\\/li>/g).length === editor.match(/<li>/g).length, 'Make sure your <code>li</code> element has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1354,19 +1358,19 @@
       "name": "Waypoint: Create an Ordered List",
       "difficulty": 0.037,
       "description": [
-        "Create an <code>ordered list</code> of the top 3 things cats hate the most.",
+        "Create an ordered list of the top 3 things cats hate the most.",
         "HTML has a special element for creating ordered lists, or numbered-style lists.",
         "Ordered lists start with a <code>&#60;ol&#62;</code> element. Then they contain some number of <code>&#60;li&#62;</code> elements.",
         "For example: <code>&#60;ol&#62;&#60;li&#62;hydrogen&#60;/li&#62;&#60;li&#62;helium&#60;/li&#62;&#60;/ol&#62;</code> would create a numbered list of \"hydrogen\" and \"helium\"."
       ],
       "tests": [
-        "assert($('ul').length > 0, 'You should have an <code>ul</code> element on your webpage.')",
-        "assert($('ol').length > 0, 'You should have an <code>ol</code> element on your webpage.')",
+        "assert($('ul').length > 0, 'You should have an <code>ul</code> element on your page.')",
+        "assert($('ol').length > 0, 'You should have an <code>ol</code> element on your page.')",
         "assert($('li').length > 5, 'You should have three <code>li</code> elements within your <code>ul</code> element.')",
         "assert($('li').length > 5, 'You should have three <code>li</code> elements within your <code>ol</code> element.')",
-        "assert(editor.match(/<\\/ol>/g), 'Make sure your <code>ol</code> element has a closing tag.')",
-        "assert(editor.match(/<\\/ul>/g), 'Make sure your <code>ul</code> element has a closing tag.')",
-        "assert(editor.match(/<\\/li>/g).length > 5, 'Make sure each of your <code>li</code> elements has a closing tag.')"
+        "assert(editor.match(/<\\/ul>/g) && editor.match(/<\\/ul>/g).length === editor.match(/<ul>/g).length, 'Make sure your <code>ul</code> element has a closing tag.')",
+        "assert(editor.match(/<\\/ol>/g) && editor.match(/<\\/ol>/g).length === editor.match(/<ol>/g).length, 'Make sure your <code>ol</code> element has a closing tag.')",
+        "assert(editor.match(/<\\/li>/g) && editor.match(/<\\/li>/g).length === editor.match(/<li>/g).length, 'Make sure your <code>li</code> element has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1426,9 +1430,9 @@
       "name": "Waypoint: Create a Text Field",
       "difficulty": 0.038,
       "description": [
-        "Now we'll create a web form. Create a text field under your lists.",
+        "Now we'll create a web form. Create a text input under your lists.",
         "Text inputs are a convenient way to get input from your user.",
-        "You can create one like this: <code>&#60;input type='text'&#62;</code>"
+        "You can create one like this: <code>&#60;input type='text'&#62;</code>. Note that <code>input</code> elements are self-closing."
       ],
       "tests": [
         "assert($('input').length > 0, 'Your app should have an text field input element.')"
@@ -1497,13 +1501,13 @@
       "name": "Waypoint: Add Placeholder Text to a Text Field",
       "difficulty": 0.039,
       "description": [
-        "Add the placeholder text \"cat photo URL\" to your text field.",
-        "Placeholder text will appear in your text field before your user has inputed anything.",
-        "For example: <code>&#60;input type='text' placeholder='this is placeholder text'&#62;</code>"
+        "Set the <code>placeholder</code> value of your text <code>input</code> to \"cat photo URL\".",
+        "Your placeholder text is what appears in your text <code>input</code> before your user has inputed anything.",
+        "You can create placeholder text like so: <code>&#60;input type='text' placeholder='this is placeholder text'&#62;</code>."
       ],
       "tests": [
-        "assert($('input[placeholder]').length > 0, 'Your text field should have a placeholder attribute.')",
-        "assert($('input').attr('placeholder') === 'cat photo URL', 'Your placeholder field should have the value of \"cat photo URL\".')"
+        "assert($('input[placeholder]').length > 0, 'Add a <code>placeholder</code> attribute text <code>input</code> element.')",
+        "assert($('input').attr('placeholder').match(/cat\\s+photo\\s+URL/gi), 'Set the value of your placeholder attribute to \"cat photo URL\".')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1570,14 +1574,14 @@
       "name": "Waypoint: Create a Form Element",
       "difficulty": 0.040,
       "description": [
-        "Wrap your text field in a <code>&#60;form&#62;</code> element. Add the <code>action=\"/submit-cat-photo\"</code> attribute to this form element.",
+        "Wrap your text field in a <code>form</code> element. Add the <code>action=\"/submit-cat-photo\"</code> attribute to this form element.",
         "You can build web forms that actually submit data to a server using nothing more than pure HTML. You can do this by specifying an action on your <code>form</code> element.",
-        "For example: <code>&#60;form action=\"/url-where-you-want-to-submit-form-data\"&#62;&#60;/form&#62;</code>"
+        "For example: <code>&#60;form action=\"/url-where-you-want-to-submit-form-data\"&#62;&#60;/form&#62;</code>."
       ],
       "tests": [
         "assert($('form').length > 0, 'Wrap your text input element within a <code>form</code> element.')",
         "assert($('form').attr('action'), 'Your <code>form</code> element should have an <code>action</code> attribute.')",
-        "assert(editor.match(/<\\/form>/g), 'Make sure your <code>form</code> elements has a closing tag.')",
+        "assert(editor.match(/<\\/form>/g) && editor.match(/<form/g) && editor.match(/<\\/form>/g).length === editor.match(/<form/g).length, 'Make sure your <code>form</code> element has a closing tag.')",
         "assert(editor.match(/\\/submit-cat-photo/ig), 'Make sure your <code>form</code> action is set to <code>/submit-cat-photo</code>.')"
       ],
       "challengeSeed": [
@@ -1647,13 +1651,13 @@
       "description": [
         "Add a submit button to your <code>form</code> element with type \"submit\" and \"Submit\" as its text.",
         "Let's add a submit button to your form. Clicking this button will send the data from your form to the URL you specified with your form's <code>action</code> attribute.",
-        "Here's an example submit button: <code>&#60;button type='submit'&#62;this button submits the form&#60;/button&#62;</code>"
+        "Here's an example submit button: <code>&#60;button type='submit'&#62;this button submits the form&#60;/button&#62;</code>."
       ],
       "tests": [
         "assert($('form').children('button').length > 0, 'Your form should have a button inside it.')",
         "assert($('button').attr('type') === 'submit', 'Your submit button should have be of input type \"submit\".')",
         "assert($('button').text().match(/submit/gi), 'Your submit button should have the text \"submit\".')",
-        "assert(editor.match(/<\\/button>/g), 'Make sure your <code>button</code> element has a closing tag.')"
+        "assert(editor.match(/<\\/button>/g) && editor.match(/<button/g) && editor.match(/<\\/button>/g).length === editor.match(/<button/g).length, 'Make sure your <code>button</code> element has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1722,12 +1726,12 @@
       "name": "Waypoint: Use HTML5 to Require a Field",
       "difficulty": 0.042,
       "description": [
-        "Make it required for your user to input text into your form before being able to submit it.",
-        "You can require your user to complete specific form fields before they will be able to submit your form.",
-        "For example, if you wanted to make a text input field required, you can just add the word \"required\" within your <code>input</code> element use: <code>&#60;input type='text' required&#62;</code>"
+        "Make your text <code>input</code> a \"required\" field, so that your user can't submit the form without completing this field.",
+        "You can require specific form fields so that your user will not be able to submit your form until he or she has filled them out.",
+        "For example, if you wanted to make a text input field required, you can just add the word \"required\" within your <code>input</code> element, you would use: <code>&#60;input type='text' required&#62;</code>."
       ],
       "tests": [
-        "assert($('input').prop('required'), 'Your text field should have the property of being required.')"
+        "assert($('input').prop('required'), 'Your text <code>input</code> element should have the \"required\" attribute.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1797,17 +1801,20 @@
       "name": "Waypoint: Create a Set of Radio Buttons",
       "difficulty": 0.043,
       "description": [
-        "Add to your form a pair of <code>radio buttons</code> that are wrapped in <code>label</code> elements and share a <code>name</code> attribute, with the options of \"indoor\" and \"outdoor\".",
-        "You can use <code>radio buttons</code> for questions where you want the user to only give you one answer.",
+        "Add to your form a pair of radio buttons. Each radio button should be wrapped within its own <code>label</code> element. They should share a common <code>name</code> attribute. One should have the option of \"indoor\" and the other should have the option of \"outdoor\".",
+        "You can use radio buttons for questions where you want the user to only give you one answer.",
         "Radio buttons are a type of <code>input</code>.",
-        "Radio buttons should be wrapped within <code>label</code> elements.",
+        "Each of your radio buttons should be wrapped within its own <code>label</code> elements.",
         "All related radio buttons should have the same <code>name</code> attribute.",
-        "Here's an example of a radio button: <code>&#60;label&#62;&#60;input type='radio' name='indoor-outdoor'&#62; Indoor&#60;/label&#62;</code>"
+        "Here's an example of a radio button: <code>&#60;label&#62;&#60;input type='radio' name='indoor-outdoor'&#62; Indoor&#60;/label&#62;</code>."
       ],
       "tests": [
-        "assert($('input[type=\"radio\"]').length > 1, 'Your webpage should have two radio button elements.')",
+        "assert($('input[type=\"radio\"]').length > 1, 'Your page should have two radio button elements.')",
         "assert($('input[type=\"radio\"]:nth-child(1)').attr('name') === 'indoor-outdoor', 'Give your radio buttons the <code>name</code> attribute of \"indoor-outdoor\".')",
-        "assert($('label').length > 1, 'Each of your two radio button elements should be wrapped in a label element.')"
+        "assert($('label').length > 1, 'Each of your two radio button elements should be wrapped in a label element.')",
+        "assert(editor.match(/<\\/label>/g) && editor.match(/<label/g) && editor.match(/<\\/label>/g).length === editor.match(/<label/g).length, 'Make sure each of your <code>label</code> elements has a closing tag.')",
+        "assert($('label').text().match(/indoor/gi), 'One of your radio buttons should have the label \"indoor\".')",
+        "assert($('label').text().match(/outdoor/gi), 'One of your radio buttons should have the label \"outdoor\".')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1877,13 +1884,15 @@
       "name": "Waypoint: Create a Set of Checkboxes",
       "difficulty": 0.044,
       "description": [
-        "Add to your form a set of three <code>checkbox</code> elements that are wrapped in <code>label</code> elements and share the same <code>name</code> attribute.",
-        "Forms commonly use <code>checkbox</code> elements for questions that may have more than one answer.",
-        "For example: <code>&#60;label&#62;&#60;input type='checkbox' name='personality'&#62; Loving&#60;/label&#62;</code>"
+        "Add to your form a set of three checkbox elements. Each checkbox should be wrapped within its own <code>label</code> element. All three should share the <code>name</code> attribute of \"personality\".",
+        "Forms commonly use checkbox inputs for questions that may have more than one answer.",
+        "For example: <code>&#60;label&#62;&#60;input type='checkbox' name='personality'&#62; Loving&#60;/label&#62;</code>."
       ],
       "tests": [
-        "assert($('input[type=\"checkbox\"]').length > 2, 'Your webpage should have three checkbox elements.')",
-        "assert($('label:has(input[type=\"checkbox\"])').length > 2, 'Each of your three checkbox elements should be wrapped in a label element.')"
+        "assert($('input[type=\"checkbox\"]').length > 2, 'Your page should have three checkbox elements.')",
+        "assert($('label:has(input[type=\"checkbox\"])').length > 2, 'Each of your three checkbox elements should be wrapped in its own <code>label</code> element.')",
+        "assert(editor.match(/<\\/label>/g) && editor.match(/<label/g) && editor.match(/<\\/label>/g).length === editor.match(/<label/g).length, 'Make sure each of your <code>label</code> elements has a closing tag.')",
+        "assert($('input[type=\"checkbox\"]:nth-child(1)').attr('name') === 'trait', 'Give your radio buttons the <code>name</code> attribute of \"personality\".')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1956,7 +1965,7 @@
       "difficulty": 0.045,
       "description": [
         "Clean up your form by adding linebreaks between form elements.",
-        "Remember that you can create a linebreak element by using the code: <code>&#60;br&#62;</code>"
+        "Remember that you can create a linebreak element by using the code: <code>&#60;br&#62;</code>."
       ],
       "tests": [
         "assert($('br').length > 1, 'Add at least 2 line breaks to visually separate your form elements.')"
@@ -2114,14 +2123,14 @@
     },
     {
       "_id": "bad87fee1348bd9aede08835",
-      "name": "Waypoint: Wrap Many Elements within a Div Element",
+      "name": "Waypoint: Wrap Many Elements within a Single Div Element",
       "difficulty": 0.047,
       "description": [
         "Wrap your \"Things cats love\" and \"Things cats hate\" lists all within a single <code>div</code> element.",
         "The <code>div</code> element, or \"Division\" element, is a general purpose container for other elements.",
-        "The <code>div</code> element is probably the most commonly used HTML element of all. It's useful for assigning classes down to all the elements that it contains.",
+        "The <code>div</code> element is probably the most commonly used HTML element of all. It's useful for passing the CSS of its own class declarations down to all the elements that it contains.",
         "Just like any other non-self-closing element, you can open a <code>div</code> element with <code>&#60;div&#62;</code> and close it on another line with <code>&#60;/div&#62;</code>.",
-        "Try putting your opening <code>div</code> tag above your \"Things cats love\" <code>p</code> element and your closing <code>div</code> tag after your closing <code>ol</code> tag so that both of your lists are within one div."
+        "Try putting your opening <code>div</code> tag above your \"Things cats love\" <code>p</code> element and your closing <code>div</code> tag after your closing <code>ol</code> tag so that both of your lists are within one <code>div</code>."
       ],
       "tests": [
         "assert($('div').children('ol').length > 0, 'Wrap your <code>ol</code> element inside your <code>div</code> element.')",
@@ -2207,7 +2216,7 @@
       "description": [
         "Create a class called \"gray-background\" with the background color of gray. Assign this class to your <code>div</code> element.",
         "You can set an element's background color with the \"background-color\" attribute.",
-        "For example, if you wanted an element's background color to be \"green\", you'd use <code>.green-background { background-color: green; }</code>."
+        "For example, if you wanted an element's background color to be \"green\", you'd use <code>.green-background { background-color: green; }</code> within your <code>style</code> element."
       ],
       "tests": [
         "assert($('div').hasClass('gray-background'), 'Give your <code>div</code> element the class \"gray-background\".')",
@@ -2417,8 +2426,8 @@
       "description": [
         "Change the <code>margin</code> of the green box to a negative value, so it fills the entire horizontal width of the yellow box around it.",
         "An element's <code>margin</code> controls the amount of space between an element's <code>border</code> and surrounding elements.",
-        "If you set an element's margin to a negative value, the element will grow larger.",
-        "Try to set the margin to a negative value like the one for the red box."
+        "If you set an element's <code>margin</code> to a negative value, the element will grow larger.",
+        "Try to set the <code>margin</code> to a negative value like the one for the red box."
       ],
       "tests": [
         "assert($('.green-box').css('margin-top') === '-15px', 'Your <code>green-box</code> class should give elements -15px of margin.')"
@@ -2477,9 +2486,9 @@
       "name": "Waypoint: Add Different Padding to Each Side of an Element",
       "difficulty": 0.067,
       "description": [
-        "Give the green box a padding of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.",
-        "Sometimes you will want to customize an element so that it has different padding on each of its sides.",
-        "CSS allows you to control the padding of an element on all four sides with <code>padding-top</code>, <code>padding-right</code>, <code>padding-bottom</code>, and <code>padding-left</code> attributes."
+        "Give the green box a <code>padding</code> of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.",
+        "Sometimes you will want to customize an element so that it has different <code>padding</code> on each of its sides.",
+        "CSS allows you to control the <code>padding</code> of an element on all four sides with <code>padding-top</code>, <code>padding-right</code>, <code>padding-bottom</code>, and <code>padding-left</code> attributes."
       ],
       "tests": [
         "assert($('.green-box').css('padding-top') === '40px', 'Your <code>green-box</code> class should give the top of elements 40px of padding.')",
@@ -2542,15 +2551,15 @@
       "name": "Waypoint: Add Different Margins to Each Side of an Element",
       "difficulty": 0.068,
       "description": [
-        "Give the green box a margin of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.",
-        "Sometimes you will want to customize an element so that it has a different margin on each of its sides.",
-        "CSS allows you to control the margin of an element on all four sides with <code>margin-top</code>, <code>margin-right</code>, <code>margin-bottom</code>, and <code>margin-left</code> attributes."
+        "Give the green box a <code>margin</code> of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.",
+        "Sometimes you will want to customize an element so that it has a different <code>margin</code> on each of its sides.",
+        "CSS allows you to control the <code>margin</code> of an element on all four sides with <code>margin-top</code>, <code>margin-right</code>, <code>margin-bottom</code>, and <code>margin-left</code> attributes."
       ],
       "tests": [
-        "assert($('.green-box').css('margin-top') === '40px', 'Your <code>green-box</code> class should give the top of elements 40px of margin.')",
-        "assert($('.green-box').css('margin-left') === '40px', 'Your <code>green-box</code> class should give the left of elements 40px of margin.')",
-        "assert($('.green-box').css('margin-right') === '20px', 'Your <code>green-box</code> class should give the right of elements 20px of margin.')",
-        "assert($('.green-box').css('margin-bottom') === '20px', 'Your <code>green-box</code> class should give the bottom of elements 20px of margin.')"
+        "assert($('.green-box').css('margin-top') === '40px', 'Your <code>green-box</code> class should give the top of elements 40px of <code>margin</code>.')",
+        "assert($('.green-box').css('margin-left') === '40px', 'Your <code>green-box</code> class should give the left of elements 40px of <code>margin</code>.')",
+        "assert($('.green-box').css('margin-right') === '20px', 'Your <code>green-box</code> class should give the right of elements 20px of <code>margin</code>.')",
+        "assert($('.green-box').css('margin-bottom') === '20px', 'Your <code>green-box</code> class should give the bottom of elements 20px of <code>margin</code>.')"
       ],
       "challengeSeed": [
         "<style>",
@@ -2607,15 +2616,15 @@
       "name": "Waypoint: Use Clockwise Notation to Specify the Padding of an Element",
       "difficulty": 0.069,
       "description": [
-        "Use <code>Clockwise Notation</code> to give the \".green-box\" class a padding of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.",
+        "Use Clockwise Notation to give the \".green-box\" class a <code>padding</code> of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.",
         "Instead of specifying an element's <code>padding-top</code>, <code>padding-right</code>, <code>padding-bottom</code>, and <code>padding-left</code> attributes, you can specify them all in one line, like this: <code>padding: 10px 20px 10px 20px;</code>.",
         "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific padding instructions."
       ],
       "tests": [
-        "assert($('.green-box').css('padding-top') === '40px', 'Your <code>green-box</code> class should give the top of elements 40px of padding.')",
-        "assert($('.green-box').css('padding-right') === '20px', 'Your <code>green-box</code> class should give the right of elements 20px of padding.')",
-        "assert($('.green-box').css('padding-bottom') === '20px', 'Your <code>green-box</code> class should give the bottom of elements 20px of padding.')",
-        "assert($('.green-box').css('padding-left') === '40px', 'Your <code>green-box</code> class should give the left of elements 40px of padding.')"
+        "assert($('.green-box').css('padding-top') === '40px', 'Your <code>green-box</code> class should give the top of elements 40px of <code>padding</code>.')",
+        "assert($('.green-box').css('padding-right') === '20px', 'Your <code>green-box</code> class should give the right of elements 20px of <code>padding</code>.')",
+        "assert($('.green-box').css('padding-bottom') === '20px', 'Your <code>green-box</code> class should give the bottom of elements 20px of <code>padding</code>.')",
+        "assert($('.green-box').css('padding-left') === '40px', 'Your <code>green-box</code> class should give the left of elements 40px of <code>padding</code>.')"
       ],
       "challengeSeed": [
         "<style>",
@@ -2674,10 +2683,10 @@
         "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific margin instructions."
       ],
       "tests": [
-        "assert($('.green-box').css('margin-top') === '40px', 'Your <code>green-box</code> class should give the top of elements 40px of margin.')",
-        "assert($('.green-box').css('margin-right') === '20px', 'Your <code>green-box</code> class should give the right of elements 20px of margin.')",
-        "assert($('.green-box').css('margin-bottom') === '20px', 'Your <code>green-box</code> class should give the bottom of elements 20px of margin.')",
-        "assert($('.green-box').css('margin-left') === '40px', 'Your <code>green-box</code> class should give the left of elements 40px of margin.')"
+        "assert($('.green-box').css('margin-top') === '40px', 'Your <code>green-box</code> class should give the top of elements 40px of <code>margin</code>.')",
+        "assert($('.green-box').css('margin-right') === '20px', 'Your <code>green-box</code> class should give the right of elements 20px of <code>margin</code>.')",
+        "assert($('.green-box').css('margin-bottom') === '20px', 'Your <code>green-box</code> class should give the bottom of elements 20px of <code>margin</code>.')",
+        "assert($('.green-box').css('margin-left') === '40px', 'Your <code>green-box</code> class should give the left of elements 40px of <code>margin</code>.')"
 
       ],
       "challengeSeed": [