diff --git a/contents/bogo_sort/bogo_sort.md b/contents/bogo_sort/bogo_sort.md
index bc40fbd94..654fc56a1 100644
--- a/contents/bogo_sort/bogo_sort.md
+++ b/contents/bogo_sort/bogo_sort.md
@@ -14,19 +14,55 @@ In code, it looks something like this:
 
 {% method %}
 {% sample lang="jl" %}
-[import:1-14, lang:"julia"](code/julia/bogo.jl)
+[import:10-14, lang:"julia"](code/julia/bogo.jl)
 {% sample lang="cs" %}
 [import:9-15, lang:"csharp"](code/csharp/BogoSort.cs)
 {% sample lang="clj" %}
-[import:2-11, lang:"clojure"](code/clojure/bogo.clj)
+[import:7-11, lang:"clojure"](code/clojure/bogo.clj)
 {% sample lang="c" %}
-[import:4-29, lang:"c_cpp"](code/c/bogo_sort.c)
+[import:25-29, lang:"c_cpp"](code/c/bogo_sort.c)
 {% sample lang="java" %}
-[import:2-17, lang:"java"](code/java/bogo.java)
+[import:2-6, lang:"java"](code/java/bogo.java)
 {% sample lang="js" %}
-[import:1-16, lang:"javascript"](code/javascript/bogo.js)
+[import:11-15, lang:"javascript"](code/javascript/bogo.js)
 {% sample lang="py" %}
-[import:4-12, lang:"python"](code/python/bogo.py)
+[import:10-12, lang:"python"](code/python/bogo.py)
+{% sample lang="hs" %}
+[import:17-20, lang:"haskell"](code/haskell/bogoSort.hs)
+{% sample lang="m" %}
+[import:21-28, lang:"matlab"](code/matlab/bogosort.m)
+{% sample lang="cpp" %}
+[import:33-38, lang:"c_cpp"](code/c++/bogosort.cpp)
+{% sample lang="rs" %}
+[import:16-20, lang:"rust"](code/rust/bogosort.rs)
+{% sample lang="swift" %}
+[import:32-39, lang:"swift"](code/swift/bogosort.swift)
+{% endmethod %}
+
+That's it.
+Ship it!
+We are done here!
+
+## Example Code
+
+{% method %}
+{% sample lang="jl" %}
+[import, lang:"julia"](code/julia/bogo.jl)
+{% sample lang="cs" %}
+BogoSort.cs
+[import, lang:"csharp"](code/csharp/BogoSort.cs)
+Program.cs
+[import, lang:"csharp"](code/csharp/Program.cs)
+{% sample lang="clj" %}
+[import, lang:"clojure"](code/clojure/bogo.clj)
+{% sample lang="c" %}
+[import, lang:"c_cpp"](code/c/bogo_sort.c)
+{% sample lang="java" %}
+[import, lang:"java"](code/java/bogo.java)
+{% sample lang="js" %}
+[import, lang:"javascript"](code/javascript/bogo.js)
+{% sample lang="py" %}
+[import, lang:"python"](code/python/bogo.py)
 {% sample lang="hs" %}
 [import, lang:"haskell"](code/haskell/bogoSort.hs)
 {% sample lang="m" %}
@@ -39,10 +75,6 @@ In code, it looks something like this:
 [import, lang:"swift"](code/swift/bogosort.swift)
 {% endmethod %}
 
-That's it.
-Ship it!
-We are done here!
-
 
 <script>
 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
diff --git a/contents/bogo_sort/code/java/bogo.java b/contents/bogo_sort/code/java/bogo.java
index d44c3b422..556543641 100644
--- a/contents/bogo_sort/code/java/bogo.java
+++ b/contents/bogo_sort/code/java/bogo.java
@@ -1,5 +1,4 @@
 public class Bogo {
-    // The shuffle() function can be found in code/java/bogo.java
     static void bogoSort(int[] arr) {
         while(!isSorted(arr)) {
             shuffle(arr);
@@ -26,7 +25,6 @@ static void shuffle(int[] arr) {
     }
 
 
-    // main function (for testing)
     public static void main(String[] args) {
         int[] test = new int[]{20, -3, 50, 1, -6, 59};
 
diff --git a/contents/bogo_sort/code/javascript/bogo.js b/contents/bogo_sort/code/javascript/bogo.js
index b3c56b644..71f84b6d3 100644
--- a/contents/bogo_sort/code/javascript/bogo.js
+++ b/contents/bogo_sort/code/javascript/bogo.js
@@ -8,7 +8,6 @@ function isSorted(arr) {
   return true;
 }
 
-// The shuffle() function can be found in code/javascript/bogo.js
 function bogoSort(arr) {
   while (!isSorted(arr)) {
     shuffle(arr);
diff --git a/contents/bubble_sort/bubble_sort.md b/contents/bubble_sort/bubble_sort.md
index 813a59c07..80f9b71fd 100644
--- a/contents/bubble_sort/bubble_sort.md
+++ b/contents/bubble_sort/bubble_sort.md
@@ -13,7 +13,7 @@ This means that we need to go through the vector $$\mathcal{O}(n^2)$$ times with
 {% sample lang="cs" %}
 [import:9-27, lang:"csharp"](code/csharp/BubbleSort.cs)
 {% sample lang="c" %}
-[import:11-21, lang:"c_cpp"](code/c/bubble_sort.c)
+[import:10-20, lang:"c_cpp"](code/c/bubble_sort.c)
 {% sample lang="java" %}
 [import:2-12, lang:"java"](code/java/bubble.java)
 {% sample lang="js" %}
@@ -25,17 +25,17 @@ This means that we need to go through the vector $$\mathcal{O}(n^2)$$ times with
 {% sample lang="hs" %}
 [import, lang:"haskell"](code/haskell/bubbleSort.hs)
 {% sample lang="cpp" %}
-[import, lang:"c_cpp"](code/c++/bubblesort.cpp)
+[import:33-56, lang:"c_cpp"](code/c++/bubblesort.cpp)
 {% sample lang="rs" %}
-[import:6-19, lang:"rust"](code/rust/bubble_sort.rs)
+[import:6-16, lang:"rust"](code/rust/bubble_sort.rs)
 {% sample lang="d" %}
 [import:3-18, lang:"d"](code/d/bubble_sort.d)
 {% sample lang="go" %}
 [import:7-21, lang:"golang"](code/go/bubbleSort.go)
 {% sample lang="racket" %}
-[import:5-19, lang:"racket"](code/racket/bubbleSort.rkt)
+[import:6-19, lang:"racket"](code/racket/bubbleSort.rkt)
 {% sample lang="swift" %}
-[import, lang:"swift"](code/swift/bubblesort.swift)
+[import:1-12, lang:"swift"](code/swift/bubblesort.swift)
 {% sample lang="ti83b" %}
 [import:2-13, lang:"ti-83_basic"](code/ti83basic/BUBLSORT.txt)
 {% endmethod %}
@@ -45,6 +45,43 @@ Now, as you might imagine, computer scientists have optimized this to the fiery
 For now, it's fine to just bask in the simplicity that is bubble sort.
 Trust me, there are plenty of more complicated algorithms that do precisely the same thing, only much, much better (for most cases).
 
+## Example Code
+
+{% method %}
+{% sample lang="jl" %}
+[import, lang:"julia"](code/julia/bubble.jl)
+{% sample lang="cs" %}
+BubbleSort.cs
+[import, lang:"csharp"](code/csharp/BubbleSort.cs)
+Program.cs
+[import, lang:"csharp"](code/csharp/Program.cs)
+{% sample lang="c" %}
+[import, lang:"c_cpp"](code/c/bubble_sort.c)
+{% sample lang="java" %}
+[import, lang:"java"](code/java/bubble.java)
+{% sample lang="js" %}
+[import, lang:"javascript"](code/javascript/bubble.js)
+{% sample lang="py" %}
+[import, lang:"python"](code/python/bubblesort.py)
+{% sample lang="m" %}
+[import, lang:"matlab"](code/matlab/bubblesort.m)
+{% sample lang="hs" %}
+[import, lang:"haskell"](code/haskell/bubbleSort.hs)
+{% sample lang="cpp" %}
+[import, lang:"c_cpp"](code/c++/bubblesort.cpp)
+{% sample lang="rs" %}
+[import, lang:"rust"](code/rust/bubble_sort.rs)
+{% sample lang="d" %}
+[import, lang:"d"](code/d/bubble_sort.d)
+{% sample lang="go" %}
+[import, lang:"golang"](code/go/bubbleSort.go)
+{% sample lang="racket" %}
+[import, lang:"racket"](code/racket/bubbleSort.rkt)
+{% sample lang="swift" %}
+[import, lang:"swift"](code/swift/bubblesort.swift)
+{% sample lang="ti83b" %}
+[import, lang:"ti-83_basic"](code/ti83basic/BUBLSORT.txt)
+{% endmethod %}
 
 <script>
 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
diff --git a/contents/bubble_sort/code/java/bubble.java b/contents/bubble_sort/code/java/bubble.java
index fa7dd9971..2c6e06ba1 100644
--- a/contents/bubble_sort/code/java/bubble.java
+++ b/contents/bubble_sort/code/java/bubble.java
@@ -12,7 +12,6 @@ static void bubbleSort(int[] arr) {
     }
 
 
-    // main function (for testing)
     public static void main(String[] args) {
         int[] test = new int[]{20, -3, 50, 1, -6, 59};