diff --git a/apps/gipy/README.md b/apps/gipy/README.md
index 6c9b87c23..87eadc3b6 100644
--- a/apps/gipy/README.md
+++ b/apps/gipy/README.md
@@ -20,10 +20,10 @@ It provides the following features :
 - display the path with current position from gps
 - detects and buzzes if you leave the path
 - buzzes before sharp turns
-- buzzes before nodes with comments
+- buzzes before waypoints 
 (for example when you need to turn in https://mapstogpx.com/)
 - display instant / average speed
-- display distance to next node
+- display distance to next point
 - display additional data from openstreetmap :
     - water points
     - toilets
@@ -57,19 +57,22 @@ Your path will be displayed in svg.
 Once you start gipy you will have a menu for selecting your trace (if more than one).
 Choose the one you want and here you go :
 
-![Screenshot](screenshot2.png)
+![Screenshot](legend.png)
 
 On your screen you can see :
 
 - yourself (the big black dot)
 - the path (the top of the screen is in front of you)
+- on the path, current and next segments are red and other ones are black
 - if needed a projection of yourself on the path (small black dot)
-- extremities of segments as white dots
-- turning points as doubled white dots
+- points as white dots
+- waypoints as doubled white dots
 - some text on the left (from top to bottom) :
+    * time to reach start point at current average speed
     * current time
+    * time to reach end point at current average speed
     * left distance till end of current segment
-    * distance from start of path / path length
+    * remaining distance / path length
     * average speed / instant speed
 - interest points from openstreetmap as color dots :
     * red : bakery
@@ -79,7 +82,11 @@ On your screen you can see :
 - a *turn* indicator on the top right when you reach a turning point
 - a *gps* indicator (blinking) on the top right if you lose gps signal
 - a *lost* indicator on the top right if you stray too far away from path
-- a black segment extending from you when you are lost, indicating the rough direction of where to go
+
+If you stray away from path we will rescale the display to continue displaying nearby segments and
+display the direction to follow as a black segment.
+
+![Lost](lost.png)
 
 ### Settings
 
@@ -87,6 +94,7 @@ Few settings for now (feel free to suggest me more) :
 
 - keep gps alive : if turned off, will try to save battery by turning the gps off on long segments
 - max speed : used to compute how long to turn the gps off
+- display points : display/hide points (not waypoints)
 
 ### Caveats
 
diff --git a/apps/gipy/legend.png b/apps/gipy/legend.png
new file mode 100644
index 000000000..9040f6df8
Binary files /dev/null and b/apps/gipy/legend.png differ
diff --git a/apps/gipy/lost.png b/apps/gipy/lost.png
new file mode 100644
index 000000000..348eaed8e
Binary files /dev/null and b/apps/gipy/lost.png differ