Comments and small improvements