assorted improvements