#2 fix pb counter increment + rspec failure + many improuvement