Some changes and adittions.