Added changes mentioned in merge request !9, fixed lots of bugs, this should be a stable version now that is ready for testing

Signed-off-by: Clemens John <clemens.john@floh1111.de>