diff --git a/draw.c b/draw.c
index 425eaffa..f15a1259 100644
--- a/draw.c
+++ b/draw.c
@@ -29,6 +29,12 @@
 
 extern AwesomeConf globalconf;
 
+/** Get a draw context
+ * \param phys_screen physical screen id
+ * \param width width
+ * \param height height
+ * \return draw context ref
+ */
 DrawCtx *
 draw_get_context(int phys_screen, int width, int height)
 {
@@ -46,6 +52,9 @@ draw_get_context(int phys_screen, int width, int height)
     return d;
 };
 
+/** Free a draw context and its drawable
+ * \param ctx the draw context to free
+ */
 void
 draw_free_context(DrawCtx *ctx)
 {
@@ -53,6 +62,17 @@ draw_free_context(DrawCtx *ctx)
     p_delete(&ctx);
 }
 
+/** Draw text into a draw context
+ * \param x x coord
+ * \param y y coord
+ * \param w width
+ * \param h height
+ * \param padding padding to add before drawing the text
+ * \param font font to use
+ * \param text text to draw
+ * \param fg foreground color
+ * \param bg background color
+ */
 void
 draw_text(DrawCtx *ctx, int x, int y, int w, int h, int padding, XftFont *font, const char *text, XColor fg, XColor bg)
 {
diff --git a/screen.c b/screen.c
index 973539e1..955854ba 100644
--- a/screen.c
+++ b/screen.c
@@ -31,8 +31,8 @@ extern AwesomeConf globalconf;
 /** Get screens info
  * \param screen Screen number
  * \param statusbar statusbar
- * \return Area
  * \param padding Padding
+ * \return Area
  */
 Area
 get_screen_area(int screen, Statusbar *statusbar, Padding *padding)
@@ -175,8 +175,8 @@ get_phys_screen(int screen)
 /** Move a client to a virtual screen
  * \param c the client
  * \param new_screen The destinatiuon screen
- * \param doresize set to True if we also move the client to the new x_org and
- *         y_org of the new screen
+ * \param doresize set to True if we also move the client to the new x and
+ *        y of the new screen
  */
 void
 move_client_to_screen(Client *c, int new_screen, Bool doresize)