Tags
Examples
Some minor code updates