Fixed Some Errors!