Minor changes and utf8

Signed-off-by: Sven Haardiek <Sven@Haardiek.de>