improve log for debugging

Signed-off-by: Lehner Florian <dev@der-flo.net>
add missing returns

Signed-off-by: Lehner Florian <dev@der-flo.net>
fix whitespaces

Signed-off-by: Lehner Florian <dev@der-flo.net>
fix jumps

Signed-off-by: Lehner Florian <dev@der-flo.net>
update URI handling

Signed-off-by: Lehner Florian <dev@der-flo.net>