fixes, cleanup, 404 search