improvements

Signed-off-by: Alexander Bierbrauer <ab@sevendevs.de>