A few corrections
More general