Few tweaks, and comments updated