Predefense proofing pass

Ready to merge!