Added 404 and more stuff