fixed a redirect and some other minor TODOs