Small usage&configure updates