Added some comments/documentation
Minor changes