Comment files and more