Fix comment methods and spec them out a bit more