Fix comments and voting