Comments added in files. Some cleaning up.