Added some comments
Some minor changes