more changes to remove extraneous comment problems