Some cleanup. Also improved CD, DVD, and Game fetching