cleanup and more consistency, added 404s