Made some fixes to things now that _request() is being used.