Fixes in first chapter according to reviews

Signed-off-by: Krzysztof Opasiak <ups100@tlen.pl>
Chapter 2 + fixes from 1

Signed-off-by: Krzysztof Opasiak <ups100@tlen.pl>