Updated 404 setup; tweaked a few things