diff --git a/libknet/tests/api_knet_host_get_name_by_host_id.c b/libknet/tests/api_knet_host_get_name_by_host_id.c
index 9b98b004..e08739c2 100644
--- a/libknet/tests/api_knet_host_get_name_by_host_id.c
+++ b/libknet/tests/api_knet_host_get_name_by_host_id.c
@@ -1,100 +1,100 @@
 /*
  * Copyright (C) 2016-2018 Red Hat, Inc.  All rights reserved.
  *
  * Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
  *
  * This software licensed under GPL-2.0+, LGPL-2.0+
  */
 
 #include "config.h"
 
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "libknet.h"
 
 #include "internals.h"
 #include "test-common.h"
 
 static void test(void)
 {
 	knet_handle_t knet_h;
 	int logfds[2];
 	char name[KNET_MAX_HOST_LEN];
 
 	printf("Test knet_host_get_name_by_host_id incorrect knet_h\n");
 
 	if ((!knet_host_get_name_by_host_id(NULL, 1, name)) || (errno != EINVAL)) {
 		printf("knet_host_get_name_by_host_id accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
 		exit(FAIL);
 	}
 
 	setup_logpipes(logfds);
 
 	knet_h = knet_handle_start(logfds, KNET_LOG_DEBUG);
 
 	flush_logs(logfds[0], stdout);
 
 	printf("Test knet_host_get_name_by_host_id with incorrect hostid 1\n");
 
 	if ((!knet_host_get_name_by_host_id(knet_h, 1, name)) || (errno != EINVAL)) {
 		printf("knet_host_get_name_by_host_id accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
 		knet_handle_free(knet_h);
 		flush_logs(logfds[0], stdout);
 		close_logpipes(logfds);
 		exit(FAIL);
 	}
 
 	flush_logs(logfds[0], stdout);
 
 	printf("Test knet_host_get_name_by_host_id with incorrect name\n");
 
 	if ((!knet_host_get_name_by_host_id(knet_h, 1, NULL)) || (errno != EINVAL)) {
 		printf("knet_host_get_name_by_host_id accepted invalid name or returned incorrect error: %s\n", strerror(errno));
 		knet_handle_free(knet_h);
 		flush_logs(logfds[0], stdout);
 		close_logpipes(logfds);
 		exit(FAIL);
 	}
 
 	flush_logs(logfds[0], stdout);
 
 	printf("Test knet_host_get_name_by_host_id with correct values for hostid 1: ");
 
 	if (knet_host_add(knet_h, 1) < 0) {
 		printf("knet_host_add failed error: %s\n", strerror(errno));
 		knet_handle_free(knet_h);
 		flush_logs(logfds[0], stdout);
 		close_logpipes(logfds);
 		exit(FAIL);
 	}
 
 	if (knet_host_get_name_by_host_id(knet_h, 1, name) < 0) {
-		printf("knet_host_get_name_by_host_id faild to retrive name: %s\n", strerror(errno));
+		printf("knet_host_get_name_by_host_id faild to retrieve name: %s\n", strerror(errno));
 		knet_host_remove(knet_h, 1);
 		knet_handle_free(knet_h);
 		flush_logs(logfds[0], stdout);
 		close_logpipes(logfds);
 		exit(FAIL);
 	}
 
 	printf("%s\n", name);
 
 	flush_logs(logfds[0], stdout);
 
 	knet_host_remove(knet_h, 1);
 
 	knet_handle_free(knet_h);
 	flush_logs(logfds[0], stdout);
 	close_logpipes(logfds);
 }
 
 int main(int argc, char *argv[])
 {
 	test();
 
 	return PASS;
 }
diff --git a/libnozzle/libnozzle.h b/libnozzle/libnozzle.h
index 6baf09ee..80214518 100644
--- a/libnozzle/libnozzle.h
+++ b/libnozzle/libnozzle.h
@@ -1,315 +1,315 @@
 /*
  * Copyright (C) 2010-2018 Red Hat, Inc.  All rights reserved.
  *
  * Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
  *
  * This software licensed under GPL-2.0+, LGPL-2.0+
  */
 
 #ifndef __LIBNOZZLE_H__
 #define __LIBNOZZLE_H__
 
 #include <sys/types.h>
 #include <net/if.h>
 
 /**
  *
  * @file libnozzle.h
  * @brief tap interfaces management API include file
  * @copyright Copyright (C) 2010-2018 Red Hat, Inc.  All rights reserved.
  *
  * nozzle is a commodity library to manage tap (ethernet) interfaces
  */
 
 typedef struct nozzle_iface *nozzle_t;
 
 /**
  * nozzle_open
  * @brief create a new tap device on the system.
  *
  * devname - pointer to device name of at least size IFNAMSIZ.
  *           if the dev strlen is 0, then the system will assign a name automatically.
  *           if a string is specified, the system will try to create a device with
  *           the specified name.
  *           NOTE: on FreeBSD the tap device names can only be tapX where X is a
  *           number from 0 to 255. On Linux such limitation does not apply.
  *           The name must be unique to the system. If an interface with the same
  *           name is already configured on the system, an error will be returned.
  *
  * devname_size - length of the buffer provided in dev (has to be at least IFNAMSIZ).
  *
  * updownpath - nozzle supports the typical filesystem structure to execute
  *              actions for: down.d  post-down.d  pre-up.d  up.d
  *              in the form of:
  *              updownpath/<action>/<interface_name>
  *              updownpath specifies where to find those directories on the
  *              filesystem and it must be an absolute path.
  *
  * @return
  * nozzle_open returns
  * a pointer to a nozzle struct on success
  * NULL on error and errno is set.
  */
 
 nozzle_t nozzle_open(char *devname, size_t devname_size, const char *updownpath);
 
 /**
  * nozzle_close
  * @brief deconfigure and destroy a nozzle device
  *
  * nozzle - pointer to the nozzle struct to destroy
  *
  * @return
  * 0 on success
  * -1 on error and errno is set.
  */
 
 int nozzle_close(nozzle_t nozzle);
 
 
 #define NOZZLE_PREUP    0
 #define NOZZLE_UP       1
 #define NOZZLE_DOWN     2
 #define NOZZLE_POSTDOWN 3
 
 /**
  * nozzle_run_updown
  * @brief execute updown commands associated with a nozzle device. It is
  *        the application responsibility to call helper scripts
  *        before or after creating/destroying interfaces or IP addresses.
  *
  * nozzle - pointer to the nozzle struct
  *
  * action - pre-up.d / up.d / down.d / post-down.d (see defines above)
  *
  * exec_string - pointers to string to record executing action stdout/stderr.
  *               The string is malloc'ed, the caller needs to free the buffer.
  *               If the script generates no output this string might be NULL.
  *
  * @return
  * 0 on success
  * -1 on error and errno is set (sanity checks and internal calls.
  * -2 on error from executing the shell scripts, and no errno is set.
  */
 
 int nozzle_run_updown(const nozzle_t nozzle, uint8_t action, char **exec_string);
 
 /**
  * nozzle_set_up
  * @brief equivalent of ifconfig up
  *
  * nozzle - pointer to the nozzle struct
  *
  * @return
  * 0 on success
  * -1 on error and errno is set.
  */
 
 int nozzle_set_up(nozzle_t nozzle);
 
 /**
  * nozzle_set_down
  * @brief equivalent of ifconfig down
  *
  * nozzle - pointer to the nozzle struct
  *
  * @return
  * 0 on success
  * -1 on error and errno is set.
  */
 
 int nozzle_set_down(nozzle_t nozzle);
 
 /**
  * nozzle_add_ip
  * @brief equivalent of ip addr or ifconfig <ipaddress/prefix>
  *
  * nozzle - pointer to the nozzle struct
  *
  * ipaddr - string containing either an IPv4 or an IPv6 address.
  *          Please note that Linux will automatically remove any IPv6 addresses from an interface
  *          with MTU < 1280. libnozzle will cache those IPs and re-instate them when MTU is > 1280.
  *          MTU must be set via nozzle_set_mtu for IPv6 to be re-instated.
  *
  * prefix - 24, 64 or any valid network prefix for the requested address.
  *
  * @return
  * 0 on success
  * -1 on error and errno is set.
  */
 
 int nozzle_add_ip(nozzle_t nozzle, const char *ipaddr, const char *prefix);
 
 /**
  * nozzle_del_ip
  * @brief equivalent of ip addr del or ifconfig del <ipaddress/prefix>
  *
  * nozzle - pointer to the nozzle struct
  *
  * ipaddr - string containing either an IPv4 or an IPv6 address.
  *
  * prefix - 24, 64 or any valid network prefix for the requested address.
  *
  * @return
  * 0 on success
  * -1 on error and errno is set.
  */
 
 int nozzle_del_ip(nozzle_t nozzle, const char *ipaddr, const char *prefix);
 
 
 #define IPADDR_CHAR_MAX	128
 #define PREFIX_CHAR_MAX	  4
 
 struct nozzle_ip {
 	char ipaddr[IPADDR_CHAR_MAX + 1];
 	char prefix[PREFIX_CHAR_MAX + 1];
 	int  domain;	/* AF_INET or AF_INET6 */
 	struct nozzle_ip *next;
 };
 
 /**
  * nozzle_get_ips
- * @brief retrive the list of all configured ips for a given interface
+ * @brief retrieve the list of all configured ips for a given interface
  *
  * nozzle - pointer to the nozzle struct
  *
  * nozzle_ip - pointer to the head of a list of nozzle_ip structs.
  *             The last IP will have next = NULL.
  *             nozzle_ip can be NULL if there are no IP addresses
  *             associated with this nozzle device.
  *             *DO NOT* free those structs as they are used internally
  *             for IP address tracking.
  *
  * @return
  * 0 on success
  * -1 on error and errno is set.
  *
  */
 
 int nozzle_get_ips(const nozzle_t nozzle, struct nozzle_ip **nozzle_ip);
 
 /**
  * nozzle_get_mtu
- * @brief retrive mtu on a given nozzle interface
+ * @brief retrieve mtu on a given nozzle interface
  *
  * nozzle - pointer to the nozzle struct
  *
  * @return
  * MTU on success
  * -1 on error and errno is set.
  */
 
 int nozzle_get_mtu(const nozzle_t nozzle);
 
 /**
  * nozzle_set_mtu
  * @brief set mtu on a given nozzle interface
  *
  * nozzle - pointer to the nozzle struct
  *
  * mtu - new MTU value
  *
  * @return
  * 0 on success
  * -1 on error and errno is set.
  */
 
 int nozzle_set_mtu(nozzle_t nozzle, const int mtu);
 
 /**
  * nozzle_reset_mtu
  * @brief reset mtu on a given nozzle interface to the system default
  *
  * nozzle - pointer to the nozzle struct
  *
  * @return
  * 0 on success
  * -1 on error and errno is set.
  */
 
 int nozzle_reset_mtu(nozzle_t nozzle);
 
 /**
  * nozzle_get_mac
- * @brief retrive mac address on a given nozzle interface
+ * @brief retrieve mac address on a given nozzle interface
  *
  * nozzle - pointer to the nozzle struct
  *
  * ether_addr - pointers to string containing the current mac address.
  *              The string is malloc'ed, the caller needs to free this buffer.
  * @return
  * 0 on success.
  * -1 on error and errno is set.
  */
 
 int nozzle_get_mac(const nozzle_t nozzle, char **ether_addr);
 
 /**
  * nozzle_set_mac
  * @brief set mac address on a given nozzle interface
  *
  * nozzle - pointer to the nozzle struct
  *
  * ether_addr - pointers to string containing the new mac address.
  *
  * @return
  * 0 on success.
  * -1 on error and errno is set.
  */
 
 int nozzle_set_mac(nozzle_t nozzle, const char *ether_addr);
 
 /**
  * nozzle_reset_mac
  * @brief reset mac address on a given nozzle interface to system default
  *
  * nozzle - pointer to the nozzle struct
  *
  * @return
  * 0 on success.
  * -1 on error and errno is set.
  */
 
 int nozzle_reset_mac(nozzle_t nozzle);
 
 /**
  * nozzle_get_handle_by_name
  * @brief find a nozzle handle by device name
  *
  * devname - string containing the name of the interface
  *
  * @return
  * handle on success.
  * NULL on error and errno is set.
  */
 
 nozzle_t nozzle_get_handle_by_name(const char *devname);
 
 /**
  * nozzle_get_name_by_handle
- * @brief retrive nozzle interface name by handle
+ * @brief retrieve nozzle interface name by handle
  *
  * nozzle - pointer to the nozzle struct
  *
  * @return
  * pointer to the interface name
  * NULL on error and errno is set.
  */
 
 const char *nozzle_get_name_by_handle(const nozzle_t nozzle);
 
 /**
  * nozzle_get_fd
  * @brief
  *
  * nozzle - pointer to the nozzle struct
  *
  * @return
  * fd associated to a given nozzle on success.
  * -1 on error and errno is set.
  */
 
 int nozzle_get_fd(const nozzle_t nozzle);
 
 #endif
diff --git a/man/Makefile.am b/man/Makefile.am
index 29cd45e7..75472c9c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,122 +1,139 @@
 #
 # Copyright (C) 2017-2018 Red Hat, Inc.  All rights reserved.
 #
 # Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
 #          Federico Simoncelli <fsimon@kronosnet.org>
 #
 # This software licensed under GPL-2.0+, LGPL-2.0+
 #
 
 MAINTAINERCLEANFILES	= Makefile.in
 
 include $(top_srcdir)/build-aux/check.mk
 
 EXTRA_DIST	= kronosnetd.8 knet-keygen.8
 
 # Avoid Automake warnings about overriding these user variables.
 # Programs in this directory are used during the build only.
 AUTOMAKE_OPTIONS = -Wno-gnu
 EXEEXT=$(BUILD_EXEEXT)
 CC=$(CC_FOR_BUILD)
 CFLAGS=$(CFLAGS_FOR_BUILD)
 CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
 LDFLAGS=$(LDFLAGS_FOR_BUILD)
 
 if BUILD_MAN
 
 if BUILD_KRONOSNETD
 man8_MANS	= kronosnetd.8 knet-keygen.8
 endif
 
 noinst_PROGRAMS	= doxyxml
 
 doxyxml_SOURCES = doxyxml.c
 doxyxml_CFLAGS = $(AM_CFLAGS) $(libqb_BUILD_CFLAGS) $(libxml_BUILD_CFLAGS)
 doxyxml_LDADD = $(libqb_BUILD_LIBS) $(libxml_BUILD_LIBS)
 
 knet_man3_MANS = \
 		knet_addrtostr.3 \
 		knet_handle_add_datafd.3 \
 		knet_handle_clear_stats.3 \
 		knet_handle_compress.3 \
 		knet_handle_crypto.3 \
 		knet_handle_enable_filter.3 \
 		knet_handle_enable_pmtud_notify.3 \
 		knet_handle_enable_sock_notify.3 \
 		knet_handle_free.3 \
 		knet_handle_get_channel.3 \
 		knet_get_compress_list.3 \
 		knet_get_crypto_list.3 \
 		knet_handle_get_datafd.3 \
 		knet_handle_get_stats.3 \
 		knet_get_transport_id_by_name.3 \
 		knet_get_transport_list.3 \
 		knet_get_transport_name_by_id.3 \
 		knet_handle_get_transport_reconnect_interval.3 \
 		knet_handle_new.3 \
 		knet_handle_new_ex.3 \
 		knet_handle_pmtud_get.3 \
 		knet_handle_pmtud_getfreq.3 \
 		knet_handle_pmtud_setfreq.3 \
 		knet_handle_remove_datafd.3 \
 		knet_handle_setfwd.3 \
 		knet_handle_set_transport_reconnect_interval.3 \
 		knet_host_add.3 \
 		knet_host_enable_status_change_notify.3 \
 		knet_host_get_host_list.3 \
 		knet_host_get_id_by_host_name.3 \
 		knet_host_get_name_by_host_id.3 \
 		knet_host_get_policy.3 \
 		knet_host_get_status.3 \
 		knet_host_remove.3 \
 		knet_host_set_name.3 \
 		knet_host_set_policy.3 \
 		knet_link_clear_config.3 \
 		knet_link_get_config.3 \
 		knet_link_get_enable.3 \
 		knet_link_get_link_list.3 \
 		knet_link_get_ping_timers.3 \
 		knet_link_get_pong_count.3 \
 		knet_link_get_priority.3 \
 		knet_link_get_status.3 \
 		knet_link_set_config.3 \
 		knet_link_set_enable.3 \
 		knet_link_set_ping_timers.3 \
 		knet_link_set_pong_count.3 \
 		knet_link_set_priority.3 \
 		knet_log_get_loglevel.3 \
 		knet_log_get_loglevel_id.3 \
 		knet_log_get_loglevel_name.3 \
 		knet_log_get_subsystem_id.3 \
 		knet_log_get_subsystem_name.3 \
 		knet_log_set_loglevel.3 \
 		knet_recv.3 \
 		knet_send.3 \
 		knet_send_sync.3 \
 		knet_strtoaddr.3
 
 if BUILD_LIBNOZZLE
-nozzle_man3_MANS =
+nozzle_man3_MANS = \
+		nozzle_add_ip.3 \
+		nozzle_close.3 \
+		nozzle_del_ip.3 \
+		nozzle_get_fd.3 \
+		nozzle_get_handle_by_name.3 \
+		nozzle_get_ips.3 \
+		nozzle_get_mac.3 \
+		nozzle_get_mtu.3 \
+		nozzle_get_name_by_handle.3 \
+		nozzle_open.3 \
+		nozzle_reset_mac.3 \
+		nozzle_reset_mtu.3 \
+		nozzle_run_updown.3 \
+		nozzle_set_down.3 \
+		nozzle_set_mac.3 \
+		nozzle_set_mtu.3 \
+		nozzle_set_up.3
 endif
 
 man3_MANS = $(knet_man3_MANS) $(nozzle_man3_MANS)
 
 $(MANS): doxyfile-knet.stamp doxyfile-nozzle.stamp
 
 doxyfile-knet.stamp: $(builddir)/doxyxml Doxyfile-knet $(top_srcdir)/libknet/libknet.h
 	$(DOXYGEN) Doxyfile-knet
 	$(builddir)/doxyxml -m -P -o $(builddir) -s 3 -p @PACKAGE_NAME@ -H "Kronosnet Programmer's Manual" \
 		$$($(UTC_DATE_AT)$(SOURCE_EPOCH) +"-D %F -Y %Y") -d $(builddir)/xml-knet/ libknet_8h.xml
 	touch doxyfile-knet.stamp
 
 doxyfile-nozzle.stamp: $(builddir)/doxyxml Doxyfile-nozzle $(top_srcdir)/libnozzle/libnozzle.h
 if BUILD_LIBNOZZLE
 	$(DOXYGEN) Doxyfile-nozzle
 	$(builddir)/doxyxml -m -P -o $(builddir) -s 3 -p @PACKAGE_NAME@ -H "Kronosnet Programmer's Manual" -d $(builddir)/xml-nozzle/ libnozzle_8h.xml
 endif
 	touch doxyfile-nozzle.stamp
 
 endif
 
 clean-local:
 	rm -rf doxyfile*.stamp xml* *.3