Assorted changes? oops