fix query
use puma
gemfile reordering & cleanup