fixing some odds and ends