More tweaks to list after conversation with Jason and Josh.