Fix some of the comments described in #112