Bugfixes + added tracking