Converted a few more comments