Fix contact info. Minor cleanup.