More assorted improvements