Including nifti toolbox, bug fixes