Addressing @agramfort's comments and adding more stuff