Fix bad search terms
Fix links and clean up