Comment & pingback tweaks, see #40