added some other odds and ends