comment and file-include fixes