some minor improvements

Signed-off-by: FlorianL <cms@der-flo.net>