Jay: Many minor changes.