Various improvements

Signed-off-by: Rick Kerkhof <rick@rick-K53E.(none)>