Tweaked counter + other things