comments improvements