some bug fixes and stuff

Signed-off-by: somatonic <philipp@urlich.ch>