More updates from comments