counter refinements
minor fixes