Updates with most of Jeff's suggestions.