click through and security fixes