odds and ends cleanup