Adding some odds and ends.