Bundler fixes

This splits the bundler-commands into seperate lines, to allow easier adding, deleting and therefore merging of new PRs.

closes #1817
closes #1825
closes #2779