some more modifications

Signed-off-by: Bytesplit <bytesplit@googlemail.com>