Assorted improvements.