moved some comments