Comment list embedded

+ a minor bug fix