Tweak some more warning/error messages
Fix the argc sanity check for extract