Fixes, terminal edition and moar vulns