Commiting minor changes and some comments for a few classes