Correct the github urls and some code fine-tuning.

Signed-off-by: uhunkler <urs.hunkler@unodo.de>