fix 404s, more cleaning