Improved logging and 404ing