additions to support comments and pundit