New firewall, and minor improvements