Commenting updates and Bug fixes