adjusted bundler and refactored some controller methods