More work on getting comments to work