Funnier 404 and minor fixes