updated todos and examples