Fix incorrect initiation wrt bridge + small improvements

Signed-off-by: Marcel Verpaalen <marcel@verpaalen.com>