Some changes in commentaries and order of code