Add programme, plus few smaller changes.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>