Incorporate some examples, fix count