Comments and feedback improved