Better redirects, general hardening, modal fix