Added MSN and Yahoo and did some code cleanup.