More bug fixes, added MakeAWishFacts service