adding some more redirects and todos