Modification of classes

Adding comments, modification of mecanics