More work on trying to get the comments looking nicer