Some changes and comments