diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_2.m
index b5391b758cafba6e3c28f0beb465769334439718..e0a1df5d34fac15b23fe18d43a2f3783e7810774 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_2.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_2.m
@@ -1,4 +1,4 @@
-%% exercise 3.1.2
+%% exercise 1.6.2
 cdir = fileparts(mfilename('fullpath')); 
 [A, D] = tmg(fullfile(cdir,'../Data/textDocs.txt'));
 X = full(A)';
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_3.m b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_3.m
index fdd498e1c67d51f512c47132bf4298325f5abec0..a9c13681bf0035face788930a886b8dc2a6f9713 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_3.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_3.m
@@ -1 +1,10 @@
-%% exercise 3.1.3
cdir = fileparts(mfilename('fullpath')); 
TMGOpts.stoplist = fullfile(cdir,'../Data/stopWords.txt');
[A, D] = tmg(fullfile(cdir,'../Data/textDocs.txt'), TMGOpts);
X = full(A)';
attributeNames = cellstr(D);

%% Display the result
display(attributeNames);
display(X);
\ No newline at end of file
+%% exercise 1.6.3
+cdir = fileparts(mfilename('fullpath')); 
+TMGOpts.stoplist = fullfile(cdir,'../Data/stopWords.txt');
+[A, D] = tmg(fullfile(cdir,'../Data/textDocs.txt'), TMGOpts);
+X = full(A)';
+attributeNames = cellstr(D);
+
+%% Display the result
+display(attributeNames);
+display(X);
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_4.m b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_4.m
index 0518cd4748fdea2dec5daf77635c2de330e3bd2d..28ecde8e09c9a2aa44e6c305844959958dd3ae2e 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_4.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_4.m
@@ -1 +1,11 @@
-%% exercise 3.1.4
cdir = fileparts(mfilename('fullpath')); 
TMGOpts.stoplist = '../Data/stopWords.txt';
TMGOpts.stemming = 1;
[A, D] = tmg(fullfile(cdir,'../Data/textDocs.txt'), TMGOpts);
X = full(A)';
attributeNames = cellstr(D);

%% Display the result
display(attributeNames);
display(X);
\ No newline at end of file
+%% exercise 1.6.4
+cdir = fileparts(mfilename('fullpath')); 
+TMGOpts.stoplist = '../Data/stopWords.txt';
+TMGOpts.stemming = 1;
+[A, D] = tmg(fullfile(cdir,'../Data/textDocs.txt'), TMGOpts);
+X = full(A)';
+attributeNames = cellstr(D);
+
+%% Display the result
+display(attributeNames);
+display(X);
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_5.m b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_5.m
index ffa4d21982d415f00f3b6d9424dd8cec08486e77..0b1193a72a7b9fff287b7b346d9f461ac5e2bfac 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex1_6_5.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex1_6_5.m
@@ -1,4 +1,4 @@
-%% exercise 3.1.5
+%% exercise 1.6.5
 
 % Query vector
 q = [0; 0; 0; 0; 0; 0; 0; 1; 0; 0; 0; 0; 1; 1; 0; 0; 0]';
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_1_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_1_1.m
index f4115017e2054a948671c99dc72cc037b0309382..3da6f594881232a9a5a0e222d416020f6647ee53 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_1_1.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_1_1.m
@@ -1,4 +1,4 @@
-% exercise 3.2.1
+% exercise 2.1.1
 
 x = [-0.68; -2.11; 2.39; 0.26; 1.46; 1.33; 1.03; -0.41; -0.33; 0.47];
 
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_2_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_2_1.m
index 009817333dff41cc9d112663e65d03703f5c59ae..4b8267ccf11cbd12648a9b33bdad2e34eed7f7b1 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_2_1.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_2_1.m
@@ -1,4 +1,4 @@
-% exercise 3.3.1
+% exercise 2.2.1
 
 % Image to use as query
 i = 1;
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_2_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_2_2.m
index 52eb65d331a1a39824c0313a1f1db12600f9adcc..bf8f7225318b26de29836e8974552ab7b3d45417 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_2_2.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_2_2.m
@@ -1,4 +1,4 @@
-% exercise 3.3.2
+% exercise 2.2.2
 
 % Generate two data objects with M random attributes
 M = 5;
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_1.m
index 9a68ff4cf91cea0a1d5abf841a627e46c4751eae..a4165292b7e5847ab2106b623d87151f62f36403 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_1.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_1.m
@@ -1,4 +1,4 @@
-% exercise 4.2.1
+% exercise 2.3.1
 
 % Disable xlsread warning
 warning('off', 'MATLAB:xlsread:ActiveX'); 
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_2.m
index 205a5ddaff4fe058df6cf672e33368150c48e177..8a2b81809476069d614c9131d635e863d21095d2 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_2.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_2.m
@@ -1,4 +1,4 @@
-% exercise 4.2.2
+% exercise 2.3.2
 
 mfig('Histogram for attributes'); clf;
 for m = 1:M
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_3.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_3.m
index 517a69291d54abedb5cb57c4dcb0b58aee49330c..e0ab862fd016f9bbb7e17ebd31083119a96b99e1 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_3.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_3.m
@@ -1,4 +1,4 @@
-% exercise 4.2.3
+% exercise 2.3.3
 
 %% Boxplot of each attribute
 mfig('Boxplot'); clf;
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_4.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_4.m
index c4921d8653f57c47ec1a1c6047fb53a82bf21727..28023c0d727b335a5d3a95878e52418f9641b863 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_4.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_4.m
@@ -1,4 +1,4 @@
-% exercise 4.2.4
+% exercise 2.3.4
 
 %% Boxplot of each attribute for each class
 mfig('Boxplot per class'); clf;
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_5.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_5.m
index 0a3c8a333e98bbc1e637a6765564c4ba9629d85d..9726e8f8694bee08286acf68a933092dcbcbd063 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_5.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_5.m
@@ -1,4 +1,4 @@
-% exercise 4.2.5
+% exercise 2.3.5
 
 mfig('Matrix of scatter plots'); clf;
 for m1 = 1:M
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_6.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_6.m
index 1c5847d8f864b1ae809b56dc3d80be31ec0c585c..829243b69ab80659f90bee7ac4aa86905e9ffe8a 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_6.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_6.m
@@ -1,4 +1,4 @@
-% exercise 4.2.6
+% exercise 2.3.6
 
 ind = [1 2 3]; % Indices of the variables to plot
 mfig('3D scatter plot'); clf; hold all;
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_7.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_7.m
index 2756f69c2a28a256d26253541f6b87173a3237d9..b33695468a000e0e29515d3f6ee6b7bf1d396330 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_3_7.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_3_7.m
@@ -1,4 +1,4 @@
-% exercise 4.2.7
+% exercise 2.3.7
 
 mfig('Data matrix (standardized)'); clf;
 imagesc(zscore(X));
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_4_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_4_1.m
index 4d75b13bf447bb6666ac82028fa79ddd36977fbc..444166cab35ed666c440f2278cece0074b143cf1 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_4_1.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_4_1.m
@@ -1,4 +1,4 @@
-% exercise 4.3.1
+% exercise 2.4.1
 
 % Load the data
 cdir = fileparts(mfilename('fullpath')); 
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex2_4_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex2_4_2.m
index cccae6c07c0c911ca4ad6f8b1182844ec690f7d9..4449c52ae49eeecc8f2e74e73f7e7f268ef84221 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex2_4_2.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex2_4_2.m
@@ -1,4 +1,4 @@
-% exercise 4.3.2
+% exercise 2.4.2
 
 % Load Matlab data file and extract variables of interest
 mat_data = load('../Data/wine.mat')
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_1.m
index c5f1186acedaa71f6829e0072e5bdd871453be96..db92c3ef50ae053bb1cefd2f455fcf6c109845fe 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_1.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_1.m
@@ -1,4 +1,4 @@
-%% exercise 2.1.1
+%% exercise 3.1.1
 % Load the data into Matlab
 cdir = fileparts(mfilename('fullpath')); 
 [NUMERIC, TXT, RAW] = xlsread(fullfile(cdir,'../Data/nanonose.xls'));
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_2.m
index 5b6eee846e1397ed2ed1b2a9ea795cd92523e84c..2ffbf3b55236026b66bf3b100ed984f669a8f32f 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_2.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_2.m
@@ -1,4 +1,4 @@
-%% exercise 2.1.2
+%% exercise 3.1.2
 % Data attributes to be plotted
 i = 1;
 j = 2;
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_3.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_3.m
index 145ff5c7cdaf768b4b14906bc2c1bc014f08a37a..d93ad0bcae6a3fbfb33d3bb075dd042e240689c7 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_3.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_3.m
@@ -1,5 +1,5 @@
 
-%% exercise 2.1.3
+%% exercise 3.1.3
 
 % Subtract the mean from the data
 Y = bsxfun(@minus, X, mean(X));
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_4.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_4.m
index cf767df44e4c6129faff311e92485815c1278a45..2b7362deac88d2fe18923fe52cbb3e1ccf471c00 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_4.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_4.m
@@ -1,4 +1,4 @@
-%% exercise 2.1.4
+%% exercise 3.1.4
 
 % Index of the principal components
 i = 1;
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_6.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_6.m
index 2c3daad688cf0af37190e2c1d9c7d952bda0bf5c..175a5f73bc9dac9e894d51fddb5937c9b012cdea 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex3_1_6.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_1_6.m
@@ -1,4 +1,4 @@
-%% exercise 2.1.6
+%% exercise 3.1.6
 mfig('NanoNose: Attribute standard deviations'); clf; hold all; 
 bar(1:size(X,2), std(X));
 xticks(1:size(X,2))
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_2_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_2_1.m
index 2f064b574ca36017f92dde65f45e22e78a017d1d..16adbab958b2dc4d88b81b4a2a6cca624d30ae70 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex3_2_1.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_2_1.m
@@ -1,4 +1,4 @@
-%% exercise 2.2.1
+%% exercise 3.2.1
 
 % Digit number to display
 i = 1; 
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_2_2.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_2_2.m
index 0db965d7614fface2e85ca12af9d2e08cdaf0d1b..7861400bc8d4a0d88e15a4349f884a528c0a9c73 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex3_2_2.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_2_2.m
@@ -1,4 +1,4 @@
-%% exercise 2.2.2
+%% exercise 3.2.2
 
 % Digits to include in analysis (to include all, n = 1:10);
 n = [0,1];
diff --git a/exercises/02450Toolbox_Matlab/Scripts/ex3_3_1.m b/exercises/02450Toolbox_Matlab/Scripts/ex3_3_1.m
index 2a8135ef9d9ff5647fd5be3bfcb9acfa7884be85..249b3246e5d9c20f5644626f2dfbf7215c8ac081 100644
--- a/exercises/02450Toolbox_Matlab/Scripts/ex3_3_1.m
+++ b/exercises/02450Toolbox_Matlab/Scripts/ex3_3_1.m
@@ -1,4 +1,4 @@
-%% exercise 2.3.1
+%% exercise 3.3.1
 %% Load data
 cdir = fileparts(mfilename('fullpath')); 
 load(fullfile(cdir,'../Data/zipdata.mat'));