fix some more bugs (some of which I introduced earlier… yey)
fix some more bugs (some of which I introduced earlier… yey)

breunigs/gnt-eval,breunigs/gnt-eval,breunigs/gnt-eval,breunigs/gnt-eval,breunigs/gnt-eval,breunigs/gnt-eval,breunigs/gnt-eval