added some comments
confclits