#33 Counters + minor bugfixes