Fixed Some Mistakes