Minor fixes; Added some comments