ENH: Some changes.