Small updates and tidy-up.