Bugfixes, better example