Comments and little fixes