add option to enable / disable comments
fixes