misc last-minute tweaks and forgotten adds