Add -O3 to CFLAGS
Minor fix around switching diffusion method