Extended Hirshfeld: robust charges & accurate ESPs