Bugfixes + example