assorted changes