Change up some formatting/cleanup. Add in --link for wikipedia.