Miscellaneous comment changes