More tweaking and testing

Signed-off-by: Dennis Brandt <d.brandt@doublebinary.eu>