Some comments fixed as well as spacing issues addressed