Assorted changes and improvements