Comment files add.
Small fixes.