address comments by @agramfort