Multiple tabs and some bug corrections for diffusion