Assorted tweaks and polish