Some changes based on documenting.