Little odds and ends.  Clean up