Fix comments, used ran, etc