Final updates. Long overdue.