Update example, bugfixes