Made some of the mock analyses take more keywords.