Bugfixes + counter