Odds and ends added in