Commenting, cleanup and got fixed minor errors.