Added some odds and ends