Misc updates per Tom's suggestions.