Add some more comments from jimi-c and mpdehaan