Finishing touches (again).