Bug_fixes

@moritzdannhauer This needs a commit, see note above.