Minor tweaks; final commit for the day.