Minor tweaks and updates.