improve guest generation with comments