More updates per comments.