Fix some of the doc strings and comments