Fiddled with some comments