added odds and ends