Architecture fixed and improved and gemfile updated