ENH: better organization, fixes to fmri section