More comment updates, see #40