Small corrections and one new use case