fix resetting numbering counters
style updates