Bugfixes and features

Signed-off-by: Markus Pargmann <mpargmann@allfex.org>