Minor fixes

Hi Timo,

thanks for your tool. Please consider pulling my minor fixes.

Greetings from Karlsruhe,
Markus