Added 404, fixed redirects