Comment files + a few corrections