Cleaned up, moved "desc" into fmri dict