Assorted changes!