Add comments in code

As !4 was starting to be confusing mixing addition of comments and change in code I create this new merge request to include only comments and some variables renaming in the master branch.