more checks

Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
extend parsing

Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>