diff --git a/librerie/exercise2/build.sh b/librerie/exercise2/build.sh
index 66c5cd2..93bae60 100755
--- a/librerie/exercise2/build.sh
+++ b/librerie/exercise2/build.sh
@@ -1,7 +1,7 @@
 
 #! /bin/bash
 
-g++ -g -O3 -o main \
+g++ -O3 -o main \
   zlasdtest/exercise1/simpletest.cpp zlasdtest/exercise1/fulltest.cpp \
   zlasdtest/exercise2/simpletest.cpp zlasdtest/exercise2/fulltest.cpp \
   zlasdtest/container/container.cpp \
diff --git a/librerie/exercise2/list/list.cpp b/librerie/exercise2/list/list.cpp
index ac57556..2dd45de 100644
--- a/librerie/exercise2/list/list.cpp
+++ b/librerie/exercise2/list/list.cpp
@@ -123,7 +123,6 @@ bool List<Data>::operator!=(const List<Data>& list) const noexcept{
     }
  }
 
-
   template <typename Data>
   void List<Data>::InsertAtFront(Data&& data){
     struct Node* tmp = new Node(data);
diff --git a/librerie/exercise2/main b/librerie/exercise2/main
index a7e7e6c..ed1ea80 100755
Binary files a/librerie/exercise2/main and b/librerie/exercise2/main differ
diff --git a/librerie/exercise2/stack/vec/stackvec.cpp b/librerie/exercise2/stack/vec/stackvec.cpp
index f3b84b4..eabb6ad 100755
--- a/librerie/exercise2/stack/vec/stackvec.cpp
+++ b/librerie/exercise2/stack/vec/stackvec.cpp
@@ -104,6 +104,7 @@ void StackVec<Data>::Pop(){
     Reduce();
   }
 }
+
 template <typename Data>
 Data StackVec<Data>::TopNPop(){
   Data data = Top();
diff --git a/librerie/exercise2/zlasdtest/test.cpp b/librerie/exercise2/zlasdtest/test.cpp
index 8fd70cf..79c876e 100755
--- a/librerie/exercise2/zlasdtest/test.cpp
+++ b/librerie/exercise2/zlasdtest/test.cpp
@@ -13,7 +13,7 @@ using namespace std;
 
 void lasdtest() {
   cout << endl << "~*~#~*~ Welcome to the LASD Test Suite ~*~#~*~ " << endl;
-  //testSimpleExercise1();
+  testSimpleExercise1();
   testFullExercise1();
   testSimpleExercise2();
   testFullExercise2();
diff --git a/librerie/exercise2/zmytest/test.cpp b/librerie/exercise2/zmytest/test.cpp
index c6caf7d..f141338 100755
--- a/librerie/exercise2/zmytest/test.cpp
+++ b/librerie/exercise2/zmytest/test.cpp
@@ -5,7 +5,6 @@
 
 using namespace lasd;
 
-
 void menu(){
   unsigned short int choice;
   DataStructure chosenDataStructure;
@@ -31,6 +30,7 @@ void menu(){
   }
 }
 
+// Chooser functions
 DataStructure ChooseDataStructure(){
   unsigned short int choice;
   do{
@@ -45,7 +45,6 @@ DataStructure ChooseDataStructure(){
   else if(choice == 2)
     return DataStructure::queue;
 }
-
 DataType ChooseDataType(){
   unsigned short int choice;
   do{
@@ -63,7 +62,6 @@ DataType ChooseDataType(){
   else if(choice==3)
     return DataType::sstring;
 }
-
 Implementation ChooseImplementation(){
   unsigned short int choice;
   do{
@@ -248,6 +246,7 @@ void QueueFunctions(T& queue){
   }while(choice!=9 && choice!=8);
 }
 
+/* ----- Queue functions ----- */
 template <template <typename...> class C, typename T>
 void Enqueue(C<T>& queue){
   T element;
@@ -259,19 +258,33 @@ void Enqueue(C<T>& queue){
 
 template <typename T>
 void Dequeue(T& queue){
-  queue.Dequeue();
+  try{
+    queue.Dequeue();
+  }catch(std::length_error exc){
+    std::cout<<"Caught length_error exception!"<<std::endl<<" what(): "<<exc.what();
+  }
 }
 
 template <typename T>
 void HeadNDequeue(T& queue){
-  std::cout<<"The head and dequeued element is "<<queue.HeadNDequeue();
+  try{
+    std::cout<<"The head and dequeued element is "<<queue.HeadNDequeue();
+  }catch(std::length_error exc){
+    std::cout<<"Caught length_error exception!"<<std::endl<<" what(): "<<exc.what();
+  }
 }
 
 template <typename T>
 void Head(T& queue){
-  std::cout<<"The head is "<<queue.Head();
+  try{
+    std::cout<<"The head is "<<queue.Head();
+  }catch(std::length_error exc){
+    std::cout<<"Caught length_error exception!"<<std::endl<<" what(): "<<exc.what();
+  }
 }
 
+
+/* ----- Stack functions ----- */
 template <template <typename...> class C, typename T>
 void Push(C<T>& stk){
   T element;
@@ -283,38 +296,51 @@ void Push(C<T>& stk){
 
 template <typename T>
 void Pop(T& stk){
-  stk.Pop();
+  try{
+    stk.Pop();
+  }catch(std::length_error exc){
+    std::cout<<"Caught length_error exception!"<<std::endl<<" what(): "<<exc.what();
+  }
 }
 
 template <typename T>
 void TopNPop(T& stk){
-  std::cout<<"Element top & popped is: "<<stk.TopNPop();
+  try{
+    std::cout<<"Element top & popped is: "<<stk.TopNPop();
+  }catch(std::length_error exc){
+    std::cout<<"Caught length_error exception!"<<std::endl<<" what(): "<<exc.what();
+  }
 }
 
 template <typename T>
 void Top(T& stk){
-  std::cout<<"Element on top is: "<<stk.Top();
+  try{
+    std::cout<<"The element on top is: "<<stk.Top();
+  }catch(std::length_error exc){
+    std::cout<<"Caught length_error exception!"<<std::endl<<" what(): "<<exc.what();
+  }
 }
 
+/* ----- Shared functions ----- */
 template <typename T>
-void Empty(T& stk){
+void Empty(T& str){
   std::cout<<"It is ";
-  stk.Empty()? std::cout<<"" : std::cout<<"not ";
+  str.Empty()? std::cout<<"" : std::cout<<"not ";
   std::cout<<"empty";
 }
 
 template <typename T>
-void Size(T& stk){
-  std::cout<<"Size is "<<stk.Size();
+void Size(T& str){
+  std::cout<<"Size is "<<str.Size();
 }
 
 template <typename T>
-void Clear(T& stk){
-  stk.Clear();
+void Clear(T& str){
+  str.Clear();
   std::cout<<"It has been cleared.";
 }
 
-
+/* ----- Generator functions ----- */
 lasd::QueueLst<int> generateRandomQueueListInt(){
   ulong dim = getDimension();
   int tmp;