fixed comments according to cdok