More updates on comments