cleaning up some odds and ends