Efficiency updates to FMM