diff --git a/Resources/Sounds/Notes/1.wav b/Resources/Sounds/Notes/1.wav
index e0b5ae6..8504e63 100644
Binary files a/Resources/Sounds/Notes/1.wav and b/Resources/Sounds/Notes/1.wav differ
diff --git a/Resources/Sounds/Notes/2.wav b/Resources/Sounds/Notes/2.wav
index ae548d7..8a9bbed 100644
Binary files a/Resources/Sounds/Notes/2.wav and b/Resources/Sounds/Notes/2.wav differ
diff --git a/Resources/Sounds/Notes/3.wav b/Resources/Sounds/Notes/3.wav
index 3a581a4..e70445c 100644
Binary files a/Resources/Sounds/Notes/3.wav and b/Resources/Sounds/Notes/3.wav differ
diff --git a/Resources/Sounds/Notes/4.wav b/Resources/Sounds/Notes/4.wav
index 6e7d04b..b45a307 100644
Binary files a/Resources/Sounds/Notes/4.wav and b/Resources/Sounds/Notes/4.wav differ
diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp
index d2ec048..68607d7 100644
--- a/VaporWaveWars/combat.cpp
+++ b/VaporWaveWars/combat.cpp
@@ -16,9 +16,9 @@ Combat::Combat() {
 }
 
 Combat::~Combat(){
-     for(std::vector<Wave*>::iterator w = waves.begin(); w != waves.end();){
+    for(std::vector<Wave*>::iterator w = waves.begin(); w != waves.end();){
         w=waves.erase(w);
-     }
+    }
 }
 
 
@@ -39,9 +39,9 @@ void Combat::initShader() {
     _shader.setParameter("resolution", sf::Vector2f(W_WIDTH, W_HEIGHT));
     _shader.setParameter("time", time);
 
-     ASSERT(_haloT.loadFromFile(WORK_DIR+"Resources/platform-halo.png"));
-     _halo.setTexture(_haloT);
-     _halo.setPosition(W_WIDTH*0.05f, W_HEIGHT*0.5f);
+    ASSERT(_haloT.loadFromFile(WORK_DIR+"Resources/platform-halo.png"));
+    _halo.setTexture(_haloT);
+    _halo.setPosition(W_WIDTH*0.05f, W_HEIGHT*0.5f);
     _shaderHalo.loadFromFile(WORK_DIR+"Resources/halo.frag", sf::Shader::Fragment);
     _shaderHalo.setParameter("blue", attacking);
     _shaderHalo.setParameter("time", time);
@@ -127,20 +127,36 @@ void Combat::doMahWaves(bool p){
         notes = player->getAttack().getNotes();
     }
     else notes = enemy->getAttack().getNotes();
-
-    int anterior = notes[0];
-    if(!p) anterior = 512+512*anterior;
-    else anterior = 512-512*anterior;
-    for(int i = 0; i < notes.size(); ++i){
-        std::cout << notes[i] << std::endl;
-        Wave* w = new Wave(p);
-        //if(!p) w->setPosition(anterior,500);
-        //else w->setPosition(512-512*anterior,500);
-        w->setPosition(anterior,500);
-        if(i<notes.size()) {
-            if(!p) anterior += 256*notes[i+1];
-            else anterior -= 256*notes[i+1];
+    if (notes.size() > 0){
+        int anterior = notes[0];
+        if(!p) anterior = 512+256*anterior;
+        else anterior = 512-256*anterior;
+        for(int i = 0; i < notes.size(); ++i){
+            std::cout << notes[i] << std::endl;
+            Wave* w = new Wave(p);
+            //if(!p) w->setPosition(anterior,500);
+            //else w->setPosition(512-512*anterior,500);
+            w->setPosition(anterior,200);
+            if(i<notes.size()) {
+                if(!p) anterior += 176*notes[i+1];
+                else anterior -= 176*notes[i+1];
+            }
+            waves.push_back(w);
+        }
+
+//        int anterior = 1;
+//        if(!p) anterior = 512+256*anterior;
+//        else anterior = 512-256*anterior;
+//        for(int i = 0; i < 20; ++i){
+//            //std::cout << 0 << std::endl;
+//            Wave* w = new Wave(p);
+//            //if(!p) w->setPosition(anterior,500);
+//            //else w->setPosition(512-512*anterior,500);
+//            w->setPosition(anterior,200);
+//            if(i<20) {
+//                if(!p) anterior += 128*4;
+//                else anterior -= 128*4;
+//            }
+//            waves.push_back(w);
         }
-        waves.push_back(w);
-    }
 }
diff --git a/VaporWaveWars/mygame.cpp b/VaporWaveWars/mygame.cpp
index 7b6a4e1..3fb0d04 100644
--- a/VaporWaveWars/mygame.cpp
+++ b/VaporWaveWars/mygame.cpp
@@ -10,6 +10,7 @@ MyGame::MyGame() {
     _scenes[GameScene::credits] = _menu;
     std::cout << "in menu" << std::endl;
     SoundManager::load();
+    SoundManager::setGlobalSoundVolumen(50);
     SoundManager::setLoop(true, "intro");
     SoundManager::playMusic("intro");
 }
diff --git a/VaporWaveWars/wave.cpp b/VaporWaveWars/wave.cpp
index f77ae64..94b6a80 100644
--- a/VaporWaveWars/wave.cpp
+++ b/VaporWaveWars/wave.cpp
@@ -11,6 +11,7 @@ Wave::Wave(bool dir){
     direction = dir;
     ASSERT(texture.loadFromFile(spriteFile));
     setTexture(texture);
+    setOrigin(texture.getSize().x/2,0);
 //    sf::IntRect rect = sf::IntRect(0, 0, texture.getSize().x, texture.getSize().y);
 //    setTextureRect(rect);
 }
@@ -18,10 +19,10 @@ Wave::Wave(bool dir){
 void Wave::update(float deltaTime){
     float pos = getPosition().x;
     if (direction){
-        pos += 1280*deltaTime; // AMOUNT??
+        pos += 640*deltaTime; // AMOUNT??
     }
     else{
-        pos -= 1280*deltaTime; // ""
+        pos -= 640*deltaTime; // ""
     }
     setPosition(pos, getPosition().y);
 }