Adding some comments, improving performances.