Fixed Some Errors