More mostly minor updates