More optimizer and multipole updates