closes #625 closes #733 closes #453 closes #574 Signed-off-by: Patrick Kollitsch <patrick@davids-neighbour.com>