Update example page and bug fixes