diff --git a/gamedata/objects/combat/player.py b/gamedata/objects/combat/player.py
index 41964b6..3dbee12 100644
--- a/gamedata/objects/combat/player.py
+++ b/gamedata/objects/combat/player.py
@@ -65,7 +65,7 @@ class Player(Movable):
         # Small leap in order to get out of the water
         self.leaptimer = 1
         self.leapmaxtimer = 0.5
-        self.leapmargin = 35 # Vertical margin for the leap
+        self.leapmargin = 30 # Vertical margin for the leap
 
         self.gravityway = 1
 
@@ -73,7 +73,6 @@ class Player(Movable):
 
         if not self.hitpose:
 
-
             if self.water and self.rect.y>self.water.rect.y: # Reverse gravity underwater
                 if self.gravityway == 1:
                     self.gravityway = -1
@@ -120,6 +119,7 @@ class Player(Movable):
                 self.onceilling = False
                 if self.checkcollisions(0,self.gravityway):
                     self.onground = True
+                    self.leaptimer = self.leapmaxtimer
                     self.candash = True
                     self.canfastfall = True
                     if self.fastfall:
@@ -213,5 +213,5 @@ class Player(Movable):
         self.game.globals["cameray"] = self.rect.center[1]-self.game.globals["camerah"]/2
 
     def draw(self):
-        sprite = self.game.pygame.transform.flip(self.sprite,self.flipx,False)
+        sprite = self.game.pygame.transform.flip(self.sprite,self.flipx,self.gravityway<0 and not self.leaptimer<0)
         self.game.window.blit(sprite,[self.rect[0]-self.game.globals["camerax"],self.rect[1]-self.game.globals["cameray"]])