Assorted changes, improvements, and fixes