Some small Improvements, Restructuring.
There can be more than one counter now per section