safeties and fix summary output