[MRG]Flops and fixes.