more 404 improvements