Secure by default
Fix scaffold output
Minor improvements