Tweaks around options and multiple files