Adding end-of-candidates and bundle-only

Closes #132.