Assorted improvements