Comments and a couple of random fixes