Assorted changes :-)