address erics comments
revert picking @agramfort! and fix CTF support