Modified some minor tags and comments to avoid conflicts later.