diff --git a/source/asset.h b/source/asset.h
index 229d5d1..efb790a 100644
--- a/source/asset.h
+++ b/source/asset.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string> // para string, basic_string
-#include <vector> // para vector
+#include <string> // Para string, basic_string
+#include <vector> // Para vector
 #include "utils.h"
 
 enum class AssetType : int
diff --git a/source/balloon_formations.cpp b/source/balloon_formations.cpp
index c8383af..d8e80a9 100644
--- a/source/balloon_formations.cpp
+++ b/source/balloon_formations.cpp
@@ -1,7 +1,7 @@
 #include "balloon_formations.h"
-#include "balloon.h" // para BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE
-#include "param.h"	 // para param
-#include "utils.h"	 // para ParamGame, Param, Zone, BLOCK
+#include "balloon.h" // Para BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE
+#include "param.h"	 // Para param
+#include "utils.h"	 // Para ParamGame, Param, Zone, BLOCK
 
 void BalloonFormations::initBalloonFormations()
 {
diff --git a/source/balloon_formations.h b/source/balloon_formations.h
index 7e921b3..4bb082b 100644
--- a/source/balloon_formations.h
+++ b/source/balloon_formations.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "balloon.h" // para BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE
+#include "balloon.h" // Para BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE
 #include <vector>
 
 constexpr int NUMBER_OF_BALLOON_FORMATIONS = 100;
diff --git a/source/dbgtxt.cpp b/source/dbgtxt.cpp
index f8d1d74..29d9282 100644
--- a/source/dbgtxt.cpp
+++ b/source/dbgtxt.cpp
@@ -1,7 +1,7 @@
 #include "dbgtxt.h"
-#include <SDL2/SDL_rect.h>    // para SDL_Rect
-#include <SDL2/SDL_rwops.h>   // para SDL_RWFromMem
-#include <SDL2/SDL_surface.h> // para SDL_LoadBMP_RW
+#include <SDL2/SDL_rect.h>    // Para SDL_Rect
+#include <SDL2/SDL_rwops.h>   // Para SDL_RWFromMem
+#include <SDL2/SDL_surface.h> // Para SDL_LoadBMP_RW
 
 namespace
 {
diff --git a/source/dbgtxt.h b/source/dbgtxt.h
index f62ff53..a4c105e 100644
--- a/source/dbgtxt.h
+++ b/source/dbgtxt.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <SDL2/SDL_render.h> // para SDL_Renderer
-#include <SDL2/SDL_stdinc.h> // para Uint8
+#include <SDL2/SDL_render.h> // Para SDL_Renderer
+#include <SDL2/SDL_stdinc.h> // Para Uint8
 
 void dbg_init(SDL_Renderer *renderer);
 void dbg_print(int x, int y, const char *text, Uint8 r, Uint8 g, Uint8 b);
diff --git a/source/fade.h b/source/fade.h
index 4fee30c..ab4888f 100644
--- a/source/fade.h
+++ b/source/fade.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <SDL2/SDL_rect.h>	 // para SDL_Rect
-#include <SDL2/SDL_render.h> // para SDL_Renderer, SDL_Texture
-#include <SDL2/SDL_stdinc.h> // para Uint8, Uint16
-#include <vector>			 // para vector
+#include <SDL2/SDL_rect.h>	 // Para SDL_Rect
+#include <SDL2/SDL_render.h> // Para SDL_Renderer, SDL_Texture
+#include <SDL2/SDL_stdinc.h> // Para Uint8, Uint16
+#include <vector>			 // Para vector
 
 // Tipos de fundido
 enum class FadeType : Uint8
diff --git a/source/gif.cpp b/source/gif.cpp
index 8b16f05..2caac41 100644
--- a/source/gif.cpp
+++ b/source/gif.cpp
@@ -1,6 +1,7 @@
 #include "gif.h"
-#include <cstdio>  // Para NULL, fprintf, stderr
-#include <cstdlib> // Para malloc, realloc, exit, calloc, free
+#include <cstdio>  // Para fprintf, stderr
+#include <cstdlib> // Para exit, malloc, calloc, free, realloc
+#include <vector>  // Para vector
 
 void Gif::uncompress(int code_length, const uint8_t *input, int input_length, uint8_t *out)
 {
diff --git a/source/gif.h b/source/gif.h
index 104c908..3c3ccb5 100644
--- a/source/gif.h
+++ b/source/gif.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <cstdint> // Para uint32_t
+#include <cstdint> // Para uint8_t, uint16_t, uint32_t
 #include <cstring> // Para memcpy
-#include <vector>
 
 #define EXTENSION_INTRODUCER 0x21
 #define IMAGE_DESCRIPTOR 0x2C
diff --git a/source/input.h b/source/input.h
index ecd2e2e..e6fb790 100644
--- a/source/input.h
+++ b/source/input.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <SDL2/SDL_gamecontroller.h> // para SDL_GameControllerButton, SDL_G...
-#include <SDL2/SDL_joystick.h>		 // para SDL_Joystick
-#include <SDL2/SDL_scancode.h>		 // para SDL_Scancode
-#include <SDL2/SDL_stdinc.h>		 // para Uint8
-#include <string>					 // para string, basic_string
-#include <vector>					 // para vector
+#include <SDL2/SDL_gamecontroller.h> // Para SDL_GameControllerButton, SDL_G...
+#include <SDL2/SDL_joystick.h>		 // Para SDL_Joystick
+#include <SDL2/SDL_scancode.h>		 // Para SDL_Scancode
+#include <SDL2/SDL_stdinc.h>		 // Para Uint8
+#include <string>					 // Para string, basic_string
+#include <vector>					 // Para vector
 
 /*
 connectedControllers es un vector donde estan todos los mandos encontrados [0 .. n]
diff --git a/source/item.h b/source/item.h
index 27108d9..66397e3 100644
--- a/source/item.h
+++ b/source/item.h
@@ -1,30 +1,30 @@
 #pragma once
 
-#include <SDL2/SDL_rect.h>   // para SDL_Rect
-#include <SDL2/SDL_stdinc.h> // para Uint16
-#include <memory>            // para shared_ptr, unique_ptr
-#include <string>            // para string
-#include <vector>            // para vector
-#include "animated_sprite.h" // para SpriteAnimated
-#include "utils.h"           // para Circle
+#include <SDL2/SDL_rect.h>   // Para SDL_Rect
+#include <SDL2/SDL_stdinc.h> // Para Uint16
+#include <memory>            // Para shared_ptr, unique_ptr
+#include <string>            // Para string
+#include <vector>            // Para vector
+#include "animated_sprite.h" // Para SpriteAnimated
+#include "utils.h"           // Para Circle
 class Texture;
 
 /**
  * @brief Tipos de objetos disponibles en el juego.
  *
- * Esta enumeración define los diferentes tipos de objetos que pueden existir en el juego, 
+ * Esta enumeración define los diferentes tipos de objetos que pueden existir en el juego,
  * cada uno con un identificador único.
  */
 enum class ItemType : int
 {
-    DISK = 1,          /**< Disco */
-    GAVINA = 2,        /**< Gavina */
-    PACMAR = 3,        /**< Pacman */
-    CLOCK = 4,         /**< Reloj */
-    COFFEE = 5,        /**< Café */
-    DEBIAN = 6,        /**< Debian */
-    COFFEE_MACHINE = 7,/**< Máquina de café */
-    NONE = 8,          /**< Ninguno */
+    DISK = 1,           /**< Disco */
+    GAVINA = 2,         /**< Gavina */
+    PACMAR = 3,         /**< Pacman */
+    CLOCK = 4,          /**< Reloj */
+    COFFEE = 5,         /**< Café */
+    DEBIAN = 6,         /**< Debian */
+    COFFEE_MACHINE = 7, /**< Máquina de café */
+    NONE = 8,           /**< Ninguno */
 };
 
 /**
diff --git a/source/jail_shader.cpp b/source/jail_shader.cpp
index c028fb1..5424ed6 100644
--- a/source/jail_shader.cpp
+++ b/source/jail_shader.cpp
@@ -1,8 +1,11 @@
 #include "jail_shader.h"
-#include <SDL2/SDL.h> // para SDL_Point
-#include <cstdlib>    // para NULL, free, malloc, exit
-#include <cstring>    // para strncmp
-#include <iostream>   // para std::cout, std::endl
+#include <SDL2/SDL_opengl.h> // Para GLuint, glTexCoord2f, glVertex2f, GLfloat
+#include <SDL2/SDL_rect.h>   // Para SDL_Point
+#include <SDL2/SDL_stdinc.h> // Para SDL_bool
+#include <cstring>           // Para strncmp
+#include <iostream>          // Para basic_ostream, operator<<, endl, cout
+#include <stdexcept>         // Para runtime_error
+#include <vector>            // Para vector
 
 #ifdef __APPLE__
 #include "CoreFoundation/CoreFoundation.h"
diff --git a/source/jail_shader.h b/source/jail_shader.h
index 42a6e80..9f9ea8b 100644
--- a/source/jail_shader.h
+++ b/source/jail_shader.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <SDL2/SDL_render.h> // para SDL_Texture
-#include <SDL2/SDL_video.h>  // para SDL_Window
+#include <SDL2/SDL_render.h> // Para SDL_Texture
+#include <SDL2/SDL_video.h>  // Para SDL_Window
 #include <string>
 
 // TIPS:
@@ -39,7 +39,7 @@
 
 namespace shader
 {
-    //const bool init(SDL_Window *ventana, SDL_Texture *texturaBackBuffer, const char *vertexShader, const char *fragmentShader = nullptr);
+    // const bool init(SDL_Window *ventana, SDL_Texture *texturaBackBuffer, const char *vertexShader, const char *fragmentShader = nullptr);
     bool init(SDL_Window *ventana, SDL_Texture *texturaBackBuffer, const std::string &vertexShader, const std::string &fragmentShader = "");
     void render();
 }
\ No newline at end of file
diff --git a/source/lang.cpp b/source/lang.cpp
index 1e06fa3..b7177d0 100644
--- a/source/lang.cpp
+++ b/source/lang.cpp
@@ -1,6 +1,6 @@
 #include "lang.h"
-#include <fstream> // para basic_ifstream, basic_istream, ifstream
-#include <vector>  // para vector
+#include <fstream> // Para basic_ifstream, basic_istream, ifstream
+#include <vector>  // Para vector
 
 namespace lang
 {
diff --git a/source/lang.h b/source/lang.h
index 8c5423f..70af947 100644
--- a/source/lang.h
+++ b/source/lang.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <string> // para string
+#include <string> // Para string
 
 namespace lang
 {
diff --git a/source/manage_hiscore_table.h b/source/manage_hiscore_table.h
index 26eaf0b..efec443 100644
--- a/source/manage_hiscore_table.h
+++ b/source/manage_hiscore_table.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string> // para string
-#include <vector> // para vector
+#include <string> // Para string
+#include <vector> // Para vector
 
 /*
     Esta clase sirve para añadir elementos hiScoreEntry_r a un vector (tabla), de manera
@@ -45,7 +45,7 @@ public:
     void clear();
 
     // Añade un elemento a la tabla
-    int add(const HiScoreEntry& entry);
+    int add(const HiScoreEntry &entry);
 
     // Carga la tabla con los datos de un fichero
     bool loadFromFile(const std::string &file_path);
diff --git a/source/on_screen_help.h b/source/on_screen_help.h
index df27325..f4cd01d 100644
--- a/source/on_screen_help.h
+++ b/source/on_screen_help.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <SDL2/SDL_rect.h>   // para SDL_Rect
-#include <SDL2/SDL_render.h> // para SDL_Texture
-#include <vector>            // para vector
+#include <SDL2/SDL_rect.h>   // Para SDL_Rect
+#include <SDL2/SDL_render.h> // Para SDL_Texture
+#include <vector>            // Para vector
 class Sprite;
 class Text;
 
diff --git a/source/param.cpp b/source/param.cpp
index 75b7c33..ce3c6e7 100644
--- a/source/param.cpp
+++ b/source/param.cpp
@@ -1,10 +1,10 @@
 #include "param.h"
-#include <fstream>	// para char_traits, basic_ostream, basic_ifstream, basi...
-#include <iostream> // para cout
+#include <fstream>	// Para char_traits, basic_ostream, basic_ifstream, basi...
+#include <iostream> // Para cout
 #include <sstream>
 #include <string>
 #include <stdexcept>
-#include "utils.h" // para Param, ParamGame, Zone, ParamBalloon
+#include "utils.h" // Para Param, ParamGame, Zone, ParamBalloon
 
 Param param;
 
diff --git a/source/screen.cpp b/source/screen.cpp
index 9a2bab8..bafe6ed 100644
--- a/source/screen.cpp
+++ b/source/screen.cpp
@@ -4,8 +4,7 @@
 #include <algorithm>         // Para max, min
 #include <fstream>           // Para basic_ifstream, ifstream
 #include <iterator>          // Para istreambuf_iterator, operator==
-#include <string>            // Para allocator, operator+, char_traits, to_s...
-#include <vector>            // Para vector
+#include <string>            // Para allocator, char_traits, operator+, to_s...
 #include "asset.h"           // Para Asset
 #include "dbgtxt.h"          // Para dbg_print
 #include "global_inputs.h"   // Para service_pressed_counter
@@ -43,7 +42,7 @@ Screen::Screen(SDL_Window *window, SDL_Renderer *renderer)
 
     // Muestra la ventana
     show();
-    
+
     // Inicializa los shaders
     initShaders(); // Se ha de ejecutar con la ventana visible
 }
diff --git a/source/smart_sprite.h b/source/smart_sprite.h
index 57c2b80..8e67d82 100644
--- a/source/smart_sprite.h
+++ b/source/smart_sprite.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <memory>			 // para shared_ptr
-#include "animated_sprite.h" // para SpriteAnimated
+#include <memory>			 // Para shared_ptr
+#include "animated_sprite.h" // Para SpriteAnimated
 class Texture;
 
 // Clase SpriteSmart
diff --git a/source/stb_image.h b/source/stb_image.h
index 1f64609..7df4224 100644
--- a/source/stb_image.h
+++ b/source/stb_image.h
@@ -427,7 +427,7 @@ extern "C"
 #ifndef STBI_NO_STDIO
    STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
    STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
-// para stbi_load_from_file, file pointer is left pointing immediately after image
+// Para stbi_load_from_file, file pointer is left pointing immediately after image
 #endif
 
 #ifndef STBI_NO_GIF
@@ -503,7 +503,7 @@ extern "C"
    STBIDEF int stbi_is_16_bit_from_file(FILE *f);
 #endif
 
-   // para image formats that explicitly notate that they have premultiplied alpha,
+   // Para image formats that explicitly notate that they have premultiplied alpha,
    // we just return the colors as stored in the file. set this flag to force
    // unpremultiplication. results are undefined if the unpremultiply overflow.
    STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply);
@@ -6869,7 +6869,7 @@ static int stbi__tga_test(stbi__context *s)
       goto errorEnd;   //   test height
    sz = stbi__get8(s); //   bits per pixel
    if ((tga_color_type == 1) && (sz != 8) && (sz != 16))
-      goto errorEnd; // para colormapped images, bpp is size of an index
+      goto errorEnd; // Para colormapped images, bpp is size of an index
    if ((sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32))
       goto errorEnd;
 
@@ -7499,7 +7499,7 @@ static stbi_uc *stbi__pic_load_core(stbi__context *s, int width, int height, int
    stbi__pic_packet packets[10];
 
    // this will (should...) cater for even some bizarre stuff like having data
-   // para the same channel in multiple packets.
+   // Para the same channel in multiple packets.
    do
    {
       stbi__pic_packet *packet;
diff --git a/source/texture.cpp b/source/texture.cpp
index 34dfe5f..cee08f5 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -11,7 +11,7 @@
 #include "utils.h"			  // Para getFileName, printWithDots
 
 #define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h" // para stbi_failure_reason, stbi_image_free
+#include "stb_image.h" // Para stbi_failure_reason, stbi_image_free
 
 // Constructor
 Texture::Texture(SDL_Renderer *renderer, const std::string &path)
diff --git a/source/writer.cpp b/source/writer.cpp
index 7a1c65a..3bc569c 100644
--- a/source/writer.cpp
+++ b/source/writer.cpp
@@ -1,5 +1,5 @@
 #include "writer.h"
-#include "text.h" // para Text
+#include "text.h" // Para Text
 
 // Actualiza el objeto
 void Writer::update()
diff --git a/source/writer.h b/source/writer.h
index 7b9e510..f530b2c 100644
--- a/source/writer.h
+++ b/source/writer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <memory> // para shared_ptr
-#include <string> // para string
+#include <memory> // Para shared_ptr
+#include <string> // Para string
 class Text;
 
 // Clase Writer. Pinta texto en pantalla letra a letra a partir de una cadena y un objeto Text