Added x-tag example, further cleanup