Done
Odds and ends