Comments and small changes